aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2012-11-16 18:38:02 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-16 18:38:02 -0800
commit9904c9ebbddb04cb770fb9b4f891514851b07f93 (patch)
tree3d060c907c12712befe040a0f3a98ff871cf02e2 /java
parent41a2c10e72e02ce9215c867a67b87ecfcc725149 (diff)
parent333881c434f3905763dd92a585b17f9c515dd8a8 (diff)
downloadlatinime-9904c9ebbddb04cb770fb9b4f891514851b07f93.tar.gz
latinime-9904c9ebbddb04cb770fb9b4f891514851b07f93.tar.xz
latinime-9904c9ebbddb04cb770fb9b4f891514851b07f93.zip
am 333881c4: am 1f256e94: am 66cee1f9: Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev
* commit '333881c434f3905763dd92a585b17f9c515dd8a8': Revert "Correctly add double quote to the space strippers"
Diffstat (limited to 'java')
-rw-r--r--java/res/values-fr/donottranslate.xml2
-rw-r--r--java/res/values/donottranslate.xml2
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">&#x0009;&#x0020;\'\n-/_\"</string>
+ <string name="weak_space_stripping_symbols">"&#x0009;&#x0020;\'\n-/_"</string>
<!-- Symbols that should promote magic spaces into real space -->
<string name="phantom_space_promoting_symbols">;:!?([*&amp;@{&lt;&gt;+=|</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">&#x0009;&#x0020;\n/_\'-\"@</string>
+ <string name="weak_space_stripping_symbols">"&#x0009;&#x0020;\n/_\'-"@</string>
<!-- Symbols that should convert weak spaces into real space -->
<string name="phantom_space_promoting_symbols">([*&amp;{&lt;&gt;+=|</string>
<!-- Symbols that do NOT separate words -->