aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values-fr/donottranslate.xml5
-rw-r--r--java/res/values/donottranslate.xml5
-rw-r--r--java/res/xml/method.xml8
3 files changed, 14 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">"&#x0009;&#x0020;\'\n-/_"</string>
+ <!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) -->
+ <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 9e07b2248..a9c5e5d12 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">"&#x0009;&#x0020;\n/_\'-"@</string>
+ <!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) -->
+ <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 -->
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 3d360a8f0..038707134 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -36,6 +36,7 @@
en_GB: English Great Britain/qwerty
eo: Esperanto/spanish
es: Spanish/spanish
+ es_US: Spanish United States/spanish
et: Estonian/nordic
fa: Persian/arabic
fi: Finnish/nordic
@@ -184,6 +185,13 @@
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic"
+ android:subtypeId="-2066550842"
+ android:imeSubtypeLocale="es_US"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:label="@string/subtype_generic"
android:subtypeId="-332580523"
android:imeSubtypeLocale="et"
android:imeSubtypeMode="keyboard"