diff options
Diffstat (limited to '')
| -rw-r--r-- | java/res/values-fr/donottranslate.xml | 18 | ||||
| -rw-r--r-- | java/res/values/donottranslate.xml | 19 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/key_styles_enter.xml | 22 | ||||
| -rw-r--r-- | java/res/xml/spellchecker.xml | 12 |
6 files changed, 33 insertions, 43 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">([{*&;:!?</string> + <!-- Symbols that are normally followed by a space (used to add an auto-space after these) --> + <string name="symbols_followed_by_space">.,;:!?)]}*&</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">"	 \n"\'-/_\"</string> - <!-- Symbols that should promote magic spaces into real space --> - <string name="phantom_space_promoting_symbols">;:!?([*&@{<>+=|</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">"	 \n"()[]{}*&<>+=|.,;:!?/_\"</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">([{*&</string> + <!-- Symbols that are normally followed by a space (used to add an auto-space after these) --> + <string name="symbols_followed_by_space">.,;:!?)]}*&</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">"	 \n"/_\'-@\"</string> - <!-- Symbols that should convert weak spaces into real space --> - <string name="phantom_space_promoting_symbols">([*&{<>+=|</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">"	 \n"()[]{}*&<>+=|.,;:!?/_\"</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 5c5442708..fd7aac49f 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -376,4 +376,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> diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index 91ebac1da..0834adf20 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -71,7 +71,7 @@ > <key-style latin:styleName="enterKeyStyle" - latin:parentStyle="defaultEnterKeyStyle" /> + latin:parentStyle="shiftEnterKeyStyle" /> </case> <!-- Smiley in textShortMessage field. Overrides common enter key style. --> diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml index 3788ca8ba..61a515bad 100644 --- a/java/res/xml/key_styles_enter.xml +++ b/java/res/xml/key_styles_enter.xml @@ -99,7 +99,11 @@ latin:backgroundType="functional" latin:parentStyle="navigateMoreKeysStyle" /> <key-style - latin:styleName="defaultActionKeyStyle" + latin:styleName="shiftEnterKeyStyle" + latin:code="!code/key_shift_enter" + latin:parentStyle="defaultEnterKeyStyle" /> + <key-style + latin:styleName="defaultActionEnterKeyStyle" latin:code="!code/key_action_enter" latin:keyIcon="!icon/undefined" latin:backgroundType="action" @@ -112,7 +116,7 @@ > <key-style latin:styleName="enterKeyStyle" - latin:parentStyle="defaultEnterKeyStyle" /> + latin:parentStyle="shiftEnterKeyStyle" /> </case> <case latin:imeAction="actionGo" @@ -120,7 +124,7 @@ <key-style latin:styleName="enterKeyStyle" latin:keyLabel="!text/label_go_key" - latin:parentStyle="defaultActionKeyStyle" /> + latin:parentStyle="defaultActionEnterKeyStyle" /> </case> <case latin:imeAction="actionNext" @@ -128,7 +132,7 @@ <key-style latin:styleName="enterKeyStyle" latin:keyLabel="!text/label_next_key" - latin:parentStyle="defaultActionKeyStyle" /> + latin:parentStyle="defaultActionEnterKeyStyle" /> </case> <case latin:imeAction="actionPrevious" @@ -136,7 +140,7 @@ <key-style latin:styleName="enterKeyStyle" latin:keyLabel="!text/label_previous_key" - latin:parentStyle="defaultActionKeyStyle" /> + latin:parentStyle="defaultActionEnterKeyStyle" /> </case> <case latin:imeAction="actionDone" @@ -144,7 +148,7 @@ <key-style latin:styleName="enterKeyStyle" latin:keyLabel="!text/label_done_key" - latin:parentStyle="defaultActionKeyStyle" /> + latin:parentStyle="defaultActionEnterKeyStyle" /> </case> <case latin:imeAction="actionSend" @@ -152,7 +156,7 @@ <key-style latin:styleName="enterKeyStyle" latin:keyLabel="!text/label_send_key" - latin:parentStyle="defaultActionKeyStyle" /> + latin:parentStyle="defaultActionEnterKeyStyle" /> </case> <case latin:imeAction="actionSearch" @@ -160,7 +164,7 @@ <key-style latin:styleName="enterKeyStyle" latin:keyIcon="!icon/search_key" - latin:parentStyle="defaultActionKeyStyle" /> + latin:parentStyle="defaultActionEnterKeyStyle" /> </case> <case latin:imeAction="actionCustomLabel" @@ -168,7 +172,7 @@ <key-style latin:styleName="enterKeyStyle" latin:keyLabelFlags="fromCustomActionLabel" - latin:parentStyle="defaultActionKeyStyle" /> + latin:parentStyle="defaultActionEnterKeyStyle" /> </case> <!-- imeAction is either actionNone or actionUnspecified. --> <default> diff --git a/java/res/xml/spellchecker.xml b/java/res/xml/spellchecker.xml index 66cd66280..813319c7b 100644 --- a/java/res/xml/spellchecker.xml +++ b/java/res/xml/spellchecker.xml @@ -57,18 +57,6 @@ /> <subtype android:label="@string/subtype_generic" - android:subtypeLocale="cs" - /> - <subtype - android:label="@string/subtype_generic" - android:subtypeLocale="nl" - /> - <subtype - android:label="@string/subtype_generic" - android:subtypeLocale="hr" - /> - <subtype - android:label="@string/subtype_generic" android:subtypeLocale="pt_BR" /> </spell-checker> |