aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-03-05 21:37:41 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-05 21:37:41 -0800
commit7fc7a76b0425be8d72576c5c5e3fd0b619763812 (patch)
treede5ea95d53c6b5f97b7d424ff244b555e95bf39b /java/res
parentcbad260cf3bc1f0f06aacc305608809545969d9f (diff)
parent00ed3be95cee472685bcba1ea861ac75c61db690 (diff)
downloadlatinime-7fc7a76b0425be8d72576c5c5e3fd0b619763812.tar.gz
latinime-7fc7a76b0425be8d72576c5c5e3fd0b619763812.tar.xz
latinime-7fc7a76b0425be8d72576c5c5e3fd0b619763812.zip
Merge "Correct special space handling of punctuation"
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values-fr/donottranslate.xml6
-rw-r--r--java/res/values/donottranslate.xml2
2 files changed, 4 insertions, 4 deletions
diff --git a/java/res/values-fr/donottranslate.xml b/java/res/values-fr/donottranslate.xml
index 28140ab6a..8cf2516a6 100644
--- a/java/res/values-fr/donottranslate.xml
+++ b/java/res/values-fr/donottranslate.xml
@@ -19,11 +19,11 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Symbols that should be swapped with a magic space -->
- <string name="magic_space_swapping_symbols">.,\")]}</string>
+ <string name="weak_space_swapping_symbols">.,\")]}</string>
<!-- Symbols that should strip a magic space -->
- <string name="magic_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="magic_space_promoting_symbols">;:!?([*&amp;@{&lt;&gt;+=|</string>
+ <string name="phantom_space_promoting_symbols">;:!?([*&amp;@{&lt;&gt;+=|</string>
<!-- Symbols that do NOT separate words -->
<string name="symbols_excluded_from_word_separators">\'</string>
</resources>
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index d6a15deb0..74c68464c 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -25,7 +25,7 @@
<!-- Symbols that should strip a weak space -->
<string name="weak_space_stripping_symbols">"&#x0009;&#x0020;\n/_\'-"</string>
<!-- Symbols that should convert weak spaces into real space -->
- <string name="weak_space_promoting_symbols">([*&amp;@{&lt;&gt;+=|</string>
+ <string name="phantom_space_promoting_symbols">([*&amp;@{&lt;&gt;+=|</string>
<!-- Symbols that do NOT separate words -->
<string name="symbols_excluded_from_word_separators">\'-</string>
<!-- Word separator list is the union of all symbols except those that are not separators: