diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-08-03 08:11:05 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-08-03 08:11:05 -0700 |
| commit | f4e139a7b5426b9bddaee10f611815855a3582da (patch) | |
| tree | 0b5438cf5f3075b73ed3abc07aee94d54ef504a5 /java | |
| parent | 3695f4be479df2d73a101da03cac76992ee2cb28 (diff) | |
| parent | 9a0e1df25c1f679b1458d2205d1bc09e2af0ccbd (diff) | |
| download | latinime-f4e139a7b5426b9bddaee10f611815855a3582da.tar.gz latinime-f4e139a7b5426b9bddaee10f611815855a3582da.tar.xz latinime-f4e139a7b5426b9bddaee10f611815855a3582da.zip | |
am 9a0e1df2: am 1644a3c7: Merge "Update French and Italian separators." into jb-mr1-dev
* commit '9a0e1df25c1f679b1458d2205d1bc09e2af0ccbd':
Update French and Italian separators.
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values-fr/donottranslate.xml | 4 | ||||
| -rw-r--r-- | java/res/values-it/donottranslate.xml | 23 |
2 files changed, 3 insertions, 24 deletions
diff --git a/java/res/values-fr/donottranslate.xml b/java/res/values-fr/donottranslate.xml index 8cf2516a6..5288bd7d1 100644 --- a/java/res/values-fr/donottranslate.xml +++ b/java/res/values-fr/donottranslate.xml @@ -25,5 +25,7 @@ <!-- Symbols that should promote magic spaces into real space --> <string name="phantom_space_promoting_symbols">;:!?([*&@{<>+=|</string> <!-- Symbols that do NOT separate words --> - <string name="symbols_excluded_from_word_separators">\'</string> + <!-- Note that this is identical to the default value, but since the above ones are different + and those variables only make sense together, this is kept here for readability. --> + <string name="symbols_excluded_from_word_separators">\'-</string> </resources> diff --git a/java/res/values-it/donottranslate.xml b/java/res/values-it/donottranslate.xml deleted file mode 100644 index 58e94361b..000000000 --- a/java/res/values-it/donottranslate.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2009, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- Symbols that do NOT separate words --> - <string name="symbols_excluded_from_word_separators"></string> -</resources> |