diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-11-16 18:25:57 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-11-16 18:25:57 -0800 |
| commit | 333881c434f3905763dd92a585b17f9c515dd8a8 (patch) | |
| tree | 9019a80e47ca9b35775f049e8573ae77ea8fc3a3 /java | |
| parent | 4ad92578dde88ad6442152c86dbfd8b107fbd550 (diff) | |
| parent | 1f256e941b746a3ccfbd0b60d5e6ccd09d3a3af1 (diff) | |
| download | latinime-333881c434f3905763dd92a585b17f9c515dd8a8.tar.gz latinime-333881c434f3905763dd92a585b17f9c515dd8a8.tar.xz latinime-333881c434f3905763dd92a585b17f9c515dd8a8.zip | |
am 1f256e94: am 66cee1f9: Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev
* commit '1f256e941b746a3ccfbd0b60d5e6ccd09d3a3af1':
Revert "Correctly add double quote to the space strippers"
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values-fr/donottranslate.xml | 2 | ||||
| -rw-r--r-- | java/res/values/donottranslate.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/res/values-fr/donottranslate.xml b/java/res/values-fr/donottranslate.xml index 10feb710f..5288bd7d1 100644 --- a/java/res/values-fr/donottranslate.xml +++ b/java/res/values-fr/donottranslate.xml @@ -21,7 +21,7 @@ <!-- Symbols that should be swapped with a magic space --> <string name="weak_space_swapping_symbols">.,\")]}</string> <!-- Symbols that should strip a magic space --> - <string name="weak_space_stripping_symbols">	 \'\n-/_\"</string> + <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 f7802a8c8..9e07b2248 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -23,7 +23,7 @@ <!-- Symbols that should be swapped with a weak space --> <string name="weak_space_swapping_symbols">.,;:!?)]}\"</string> <!-- Symbols that should strip a weak space --> - <string name="weak_space_stripping_symbols">	 \n/_\'-\"@</string> + <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 --> |