aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values-fr/donottranslate.xml18
-rw-r--r--java/res/values/donottranslate.xml19
-rw-r--r--java/res/values/strings.xml3
3 files changed, 19 insertions, 21 deletions
diff --git a/java/res/values-fr/donottranslate.xml b/java/res/values-fr/donottranslate.xml
index e11e65c79..2e916a734 100644
--- a/java/res/values-fr/donottranslate.xml
+++ b/java/res/values-fr/donottranslate.xml
@@ -18,15 +18,13 @@
*/
-->
<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>
- <!-- Symbols that should strip a magic space -->
+ <!-- Symbols that are normally preceded by a space (used to add an auto-space before these) -->
+ <string name="symbols_preceded_by_space">([{*&amp;;:!?</string>
+ <!-- Symbols that are normally followed by a space (used to add an auto-space after these) -->
+ <string name="symbols_followed_by_space">.,;:!?)]}*&amp;</string>
+ <!-- Symbols that separate words -->
<!-- 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 -->
- <!-- Note that this is identical to the default value, but since the above ones are different
- and those variables only make sense together, this is kept here for readability. -->
- <string name="symbols_excluded_from_word_separators">\'-</string>
+ <string name="symbols_word_separators">"&#x0009;&#x0020;\n"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"</string>
+ <!-- Word connectors -->
+ <string name="symbols_word_connectors">\'-</string>
</resources>
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index 193a0191e..70ace776f 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -20,18 +20,15 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- 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>
- <!-- Symbols that should strip a weak space -->
+ <!-- Symbols that are normally preceded by a space (used to add an auto-space before these) -->
+ <string name="symbols_preceded_by_space">([{*&amp;</string>
+ <!-- Symbols that are normally followed by a space (used to add an auto-space after these) -->
+ <string name="symbols_followed_by_space">.,;:!?)]}*&amp;</string>
+ <!-- Symbols that separate words -->
<!-- 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 -->
- <string name="symbols_excluded_from_word_separators">\'-</string>
- <!-- Word separator list is the union of all symbols except those that are not separators:
- weak_space_swapping_symbols | weak_space_stripping_symbols
- \ symbols_excluded_from_word_separators -->
+ <string name="symbols_word_separators">"&#x0009;&#x0020;\n"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"</string>
+ <!-- Word connectors -->
+ <string name="symbols_word_connectors">\'-</string>
<!-- Symbol characters list that should switch back to the main layout -->
<!-- U+2018: "‘" LEFT SINGLE QUOTATION MARK
U+2019: "’" RIGHT SINGLE QUOTATION MARK
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 048670ada..f9d51ff69 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -375,4 +375,7 @@
<string name="prefs_keypress_vibration_duration_settings">Keypress vibration duration settings</string>
<!-- Title of the settings for keypress sound volume -->
<string name="prefs_keypress_sound_volume_settings">Keypress sound volume settings</string>
+
+ <!-- Title of the button to revert to the default value of the device in the settings dialog [CHAR LIMIT=15] -->
+ <string name="button_default">Default</string>
</resources>