aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2012-11-16 18:23:53 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-16 18:23:53 -0800
commit1f256e941b746a3ccfbd0b60d5e6ccd09d3a3af1 (patch)
treed88e49619cee4c0ff10c0e36f346858e367127f7 /java
parent7acd310d02f060f3e3e29000db902dffb6b0df9c (diff)
parent66cee1f92de0413756b8f306275d3508cd2b040f (diff)
downloadlatinime-1f256e941b746a3ccfbd0b60d5e6ccd09d3a3af1.tar.gz
latinime-1f256e941b746a3ccfbd0b60d5e6ccd09d3a3af1.tar.xz
latinime-1f256e941b746a3ccfbd0b60d5e6ccd09d3a3af1.zip
am 66cee1f9: Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev
* commit '66cee1f92de0413756b8f306275d3508cd2b040f': 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 -->