diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-11-20 20:14:13 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-11-20 20:14:13 -0800 |
| commit | 40f7b43b3f0f2845cc005a901c911637c8c591ca (patch) | |
| tree | 9809d98d977144e1b12b1cf304b9838ec1d2007f /java | |
| parent | e36af707c8a8705ebd19fcc359c51181f7ebd171 (diff) | |
| parent | 82cc7349254e1ca3722ead1f108b6c53820432d5 (diff) | |
| download | latinime-40f7b43b3f0f2845cc005a901c911637c8c591ca.tar.gz latinime-40f7b43b3f0f2845cc005a901c911637c8c591ca.tar.xz latinime-40f7b43b3f0f2845cc005a901c911637c8c591ca.zip | |
am 82cc7349: am b9385ff9: am cdbf6fb5: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
* commit '82cc7349254e1ca3722ead1f108b6c53820432d5':
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 8db436bef..a6ea8a061 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 --> |