diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-11-20 19:40:09 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-11-20 19:40:09 -0800 |
| commit | b9385ff9be484487a523c1eb6db4eba33ef2359d (patch) | |
| tree | 6ba4479a2087a30f43459544abb6b006f76d0688 /java | |
| parent | 3acd0c7a9f4a5f17897a4fe51b023d6f14ba7ef0 (diff) | |
| parent | cdbf6fb541aac9d57f4d27630ad0ef73814be54f (diff) | |
| download | latinime-b9385ff9be484487a523c1eb6db4eba33ef2359d.tar.gz latinime-b9385ff9be484487a523c1eb6db4eba33ef2359d.tar.xz latinime-b9385ff9be484487a523c1eb6db4eba33ef2359d.zip | |
am cdbf6fb5: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
* commit 'cdbf6fb541aac9d57f4d27630ad0ef73814be54f':
Correctly add double quote to the space strippers
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values-fr/donottranslate.xml | 5 | ||||
| -rw-r--r-- | java/res/values/donottranslate.xml | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/java/res/values-fr/donottranslate.xml b/java/res/values-fr/donottranslate.xml index 5288bd7d1..e11e65c79 100644 --- a/java/res/values-fr/donottranslate.xml +++ b/java/res/values-fr/donottranslate.xml @@ -19,9 +19,10 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Symbols that should be swapped with a magic space --> - <string name="weak_space_swapping_symbols">.,\")]}</string> + <string name="weak_space_swapping_symbols">.,)]}</string> <!-- Symbols that should strip a magic space --> - <string name="weak_space_stripping_symbols">"	 \'\n-/_"</string> + <!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) --> + <string name="weak_space_stripping_symbols">"	 \n"\'-/_\"</string> <!-- Symbols that should promote magic spaces into real space --> <string name="phantom_space_promoting_symbols">;:!?([*&@{<>+=|</string> <!-- Symbols that do NOT separate words --> diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 9e07b2248..a9c5e5d12 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -21,9 +21,10 @@ <!-- Symbols that are suggested between words --> <string name="suggested_punctuations">!,?,\\,,:,;,\",(,),\',-,/,@,_</string> <!-- Symbols that should be swapped with a weak space --> - <string name="weak_space_swapping_symbols">.,;:!?)]}\"</string> + <string name="weak_space_swapping_symbols">.,;:!?)]}</string> <!-- Symbols that should strip a weak space --> - <string name="weak_space_stripping_symbols">"	 \n/_\'-"@</string> + <!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) --> + <string name="weak_space_stripping_symbols">"	 \n"/_\'-@\"</string> <!-- Symbols that should convert weak spaces into real space --> <string name="phantom_space_promoting_symbols">([*&{<>+=|</string> <!-- Symbols that do NOT separate words --> |