diff options
Diffstat (limited to 'java')
61 files changed, 104 insertions, 138 deletions
diff --git a/java/res/values-af/strings.xml b/java/res/values-af/strings.xml index 30ec5ca18..cd54000fb 100644 --- a/java/res/values-af/strings.xml +++ b/java/res/values-af/strings.xml @@ -35,8 +35,6 @@ <skip /> <!-- no translation found for correction_category (2236750915056607613) --> <skip /> - <!-- no translation found for ngram_category (5337109164339320257) --> - <skip /> <!-- no translation found for misc_category (6894192814868233453) --> <skip /> <!-- no translation found for advanced_settings (362895144495591463) --> @@ -86,7 +84,6 @@ <!-- no translation found for label_to_symbol_key (8516904117128967293) --> <skip /> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Meer"</string> <string name="label_pause_key" msgid="181098308428035340">"Laat wag"</string> <string name="label_wait_key" msgid="6402152600878093134">"Wag"</string> <!-- no translation found for spoken_current_text_is (2485723011272583845) --> diff --git a/java/res/values-am/strings.xml b/java/res/values-am/strings.xml index 0b36c4968..19c135933 100644 --- a/java/res/values-am/strings.xml +++ b/java/res/values-am/strings.xml @@ -35,8 +35,6 @@ <skip /> <!-- no translation found for correction_category (2236750915056607613) --> <skip /> - <!-- no translation found for ngram_category (5337109164339320257) --> - <skip /> <!-- no translation found for misc_category (6894192814868233453) --> <skip /> <!-- no translation found for advanced_settings (362895144495591463) --> @@ -86,7 +84,6 @@ <!-- no translation found for label_to_symbol_key (8516904117128967293) --> <skip /> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"ተጨማሪ"</string> <string name="label_pause_key" msgid="181098308428035340">"ላፍታ አቁም"</string> <string name="label_wait_key" msgid="6402152600878093134">"ቆይ"</string> <!-- no translation found for spoken_current_text_is (2485723011272583845) --> diff --git a/java/res/values-ar/strings.xml b/java/res/values-ar/strings.xml index 297686844..b309abf41 100644 --- a/java/res/values-ar/strings.xml +++ b/java/res/values-ar/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"انبثاق عند ضغط مفتاح"</string> <string name="general_category" msgid="1859088467017573195">"عام"</string> <string name="correction_category" msgid="2236750915056607613">"تصحيح النص"</string> - <string name="ngram_category" msgid="5337109164339320257">"الاقتراحات بناءً على الكلمات السابقة"</string> <string name="misc_category" msgid="6894192814868233453">"خيارات أخرى"</string> <string name="advanced_settings" msgid="362895144495591463">"الإعدادات المتقدمة"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"خيارات للمستخدمين الخبراء"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"أ ب ج"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"٣٢١؟"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"٣٢١"</string> - <string name="label_more_key" msgid="3760239494604948502">"المزيد"</string> <string name="label_pause_key" msgid="181098308428035340">"توقف مؤقت"</string> <string name="label_wait_key" msgid="6402152600878093134">"انتظار"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"النص الحالي هو %s"</string> diff --git a/java/res/values-bg/strings.xml b/java/res/values-bg/strings.xml index 6b1de70ba..163992028 100644 --- a/java/res/values-bg/strings.xml +++ b/java/res/values-bg/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Изскачащ прозорец при натискане на клавиш"</string> <string name="general_category" msgid="1859088467017573195">"Общи"</string> <string name="correction_category" msgid="2236750915056607613">"Корекция на текста"</string> - <string name="ngram_category" msgid="5337109164339320257">"Предложения въз основа на предишни думи"</string> <string name="misc_category" msgid="6894192814868233453">"Други опции"</string> <string name="advanced_settings" msgid="362895144495591463">"Разширени настройки"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Опции за потребителите експерти"</string> @@ -71,7 +70,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"АБВ"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Още"</string> <string name="label_pause_key" msgid="181098308428035340">"Пауза"</string> <string name="label_wait_key" msgid="6402152600878093134">"Чака"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Текущият текст е %s"</string> diff --git a/java/res/values-ca/strings.xml b/java/res/values-ca/strings.xml index 09c956c84..9299dd5f7 100644 --- a/java/res/values-ca/strings.xml +++ b/java/res/values-ca/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Finestra emergent en prémer un botó"</string> <string name="general_category" msgid="1859088467017573195">"General"</string> <string name="correction_category" msgid="2236750915056607613">"Correcció de text"</string> - <string name="ngram_category" msgid="5337109164339320257">"Suggeriments basats en paraules anteriors"</string> <string name="misc_category" msgid="6894192814868233453">"Altres opcions"</string> <string name="advanced_settings" msgid="362895144495591463">"Configuració avançada"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Opcions per a usuaris experts"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Més"</string> <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> <string name="label_wait_key" msgid="6402152600878093134">"Espera"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"El text actual és %s"</string> diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml index bab55fd9e..455ae2f30 100644 --- a/java/res/values-cs/strings.xml +++ b/java/res/values-cs/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Zobrazit znaky při stisku klávesy"</string> <string name="general_category" msgid="1859088467017573195">"Obecné"</string> <string name="correction_category" msgid="2236750915056607613">"Oprava textu"</string> - <string name="ngram_category" msgid="5337109164339320257">"Návrhy na základě předchozích slov"</string> <string name="misc_category" msgid="6894192814868233453">"Další možnosti"</string> <string name="advanced_settings" msgid="362895144495591463">"Pokročilá nastavení"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Možnosti pro zkušené uživatele"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Další"</string> <string name="label_pause_key" msgid="181098308428035340">"Pauza"</string> <string name="label_wait_key" msgid="6402152600878093134">"Čekat"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Aktuální text je %s"</string> diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml index 349ddbe9d..b2bf49370 100644 --- a/java/res/values-da/strings.xml +++ b/java/res/values-da/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Popup ved tastetryk"</string> <string name="general_category" msgid="1859088467017573195">"Generelt"</string> <string name="correction_category" msgid="2236750915056607613">"Tekstkorrigering"</string> - <string name="ngram_category" msgid="5337109164339320257">"Forslag baseret på tidligere ord"</string> <string name="misc_category" msgid="6894192814868233453">"Andre valgmuligheder"</string> <string name="advanced_settings" msgid="362895144495591463">"Avancerede indstillinger"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Muligheder for ekspertbrugere"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Mere"</string> <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> <string name="label_wait_key" msgid="6402152600878093134">"Vent"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Nuværende tekst er %s"</string> diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml index 49b35a422..b4b113378 100644 --- a/java/res/values-de/strings.xml +++ b/java/res/values-de/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Pop-up bei Tastendruck"</string> <string name="general_category" msgid="1859088467017573195">"Allgemein"</string> <string name="correction_category" msgid="2236750915056607613">"Textkorrektur"</string> - <string name="ngram_category" msgid="5337109164339320257">"Vorschläge basieren auf bisherigen Wörtern"</string> <string name="misc_category" msgid="6894192814868233453">"Sonstige Optionen"</string> <string name="advanced_settings" msgid="362895144495591463">"Erweiterte Einstellungen"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Optionen für Experten"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Mehr"</string> <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> <string name="label_wait_key" msgid="6402152600878093134">"Warten"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Aktueller Text lautet %s"</string> diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml index 3cc94972e..9770f234c 100644 --- a/java/res/values-el/strings.xml +++ b/java/res/values-el/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Εμφάνιση με το πάτημα πλήκτρου"</string> <string name="general_category" msgid="1859088467017573195">"Γενικά"</string> <string name="correction_category" msgid="2236750915056607613">"Διόρθωση κειμένου"</string> - <string name="ngram_category" msgid="5337109164339320257">"Προτάσεις που βασίζονται σε προηγούμενες λέξεις"</string> <string name="misc_category" msgid="6894192814868233453">"Άλλες επιλογές"</string> <string name="advanced_settings" msgid="362895144495591463">"Σύνθετες ρυθμίσεις"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Επιλογές για έμπειρους χρήστες"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ΑΒΓ"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">";123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Περισσότερα"</string> <string name="label_pause_key" msgid="181098308428035340">"Παύση"</string> <string name="label_wait_key" msgid="6402152600878093134">"Αναμ."</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Το τρέχον κείμενο είναι %s"</string> diff --git a/java/res/values-en-rGB/strings.xml b/java/res/values-en-rGB/strings.xml index c2e0a2e1a..4dac3304c 100644 --- a/java/res/values-en-rGB/strings.xml +++ b/java/res/values-en-rGB/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Pop-up on key press"</string> <string name="general_category" msgid="1859088467017573195">"General"</string> <string name="correction_category" msgid="2236750915056607613">"Text correction"</string> - <string name="ngram_category" msgid="5337109164339320257">"Suggestions based on previous words"</string> <string name="misc_category" msgid="6894192814868233453">"Other Options"</string> <string name="advanced_settings" msgid="362895144495591463">"Advanced settings"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Options for expert users"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"More"</string> <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> <string name="label_wait_key" msgid="6402152600878093134">"Wait"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Current text is %s"</string> diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml index df921404c..71dbf79a0 100644 --- a/java/res/values-es-rUS/strings.xml +++ b/java/res/values-es-rUS/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Aviso emergente al pulsar tecla"</string> <string name="general_category" msgid="1859088467017573195">"General"</string> <string name="correction_category" msgid="2236750915056607613">"Corrección de texto"</string> - <string name="ngram_category" msgid="5337109164339320257">"Sugerencias sobre la base de palabras anteriores"</string> <string name="misc_category" msgid="6894192814868233453">"Otras opciones"</string> <string name="advanced_settings" msgid="362895144495591463">"Configuración avanzada"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Opciones para usuarios expertos"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Más"</string> <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> <string name="label_wait_key" msgid="6402152600878093134">"Espera"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"El texto actual es %s"</string> diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml index 714c5383e..fc7dd50e0 100644 --- a/java/res/values-es/strings.xml +++ b/java/res/values-es/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Popup al pulsar tecla"</string> <string name="general_category" msgid="1859088467017573195">"General"</string> <string name="correction_category" msgid="2236750915056607613">"Corrección ortográfica"</string> - <string name="ngram_category" msgid="5337109164339320257">"Sugerencias basadas en palabras anteriores"</string> <string name="misc_category" msgid="6894192814868233453">"Otras opciones"</string> <string name="advanced_settings" msgid="362895144495591463">"Ajustes avanzados"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Opciones para usuarios expertos"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Más"</string> <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> <string name="label_wait_key" msgid="6402152600878093134">"Espera"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"El texto actual es %s."</string> diff --git a/java/res/values-fa/strings.xml b/java/res/values-fa/strings.xml index 86498529d..9b0c352ce 100644 --- a/java/res/values-fa/strings.xml +++ b/java/res/values-fa/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"بازشو با فشار کلید"</string> <string name="general_category" msgid="1859088467017573195">"کلی"</string> <string name="correction_category" msgid="2236750915056607613">"تصحیح متن"</string> - <string name="ngram_category" msgid="5337109164339320257">"پیشنهادهایی بر اساس کلمه های قبلی"</string> <string name="misc_category" msgid="6894192814868233453">"سایر گزینه ها"</string> <string name="advanced_settings" msgid="362895144495591463">"تنظیمات پیشرفته"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"گزینه هایی برای کاربران حرفه ای"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"بیشتر"</string> <string name="label_pause_key" msgid="181098308428035340">"توقف موقت"</string> <string name="label_wait_key" msgid="6402152600878093134">"منتظر بمانید"</string> <!-- String.format failed for translation --> diff --git a/java/res/values-fi/strings.xml b/java/res/values-fi/strings.xml index 2f9a51bbd..67293059f 100644 --- a/java/res/values-fi/strings.xml +++ b/java/res/values-fi/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Ponnahdusikkuna painalluksella"</string> <string name="general_category" msgid="1859088467017573195">"Yleinen"</string> <string name="correction_category" msgid="2236750915056607613">"Tekstin korjaus"</string> - <string name="ngram_category" msgid="5337109164339320257">"Aiempiin sanoihin perustuvat ehdotukset"</string> <string name="misc_category" msgid="6894192814868233453">"Muut vaihtoehdot"</string> <string name="advanced_settings" msgid="362895144495591463">"Lisäasetukset"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Valinnat kokeneille käyttäjille"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Lisää"</string> <string name="label_pause_key" msgid="181098308428035340">"Tauko"</string> <string name="label_wait_key" msgid="6402152600878093134">"Odota"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Nykyinen teksti on %s"</string> diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml index dc5b1e743..39159d6c3 100644 --- a/java/res/values-fr/strings.xml +++ b/java/res/values-fr/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Agrandir les caractères"</string> <string name="general_category" msgid="1859088467017573195">"Général"</string> <string name="correction_category" msgid="2236750915056607613">"Correction du texte"</string> - <string name="ngram_category" msgid="5337109164339320257">"Suggestions basées sur les mots précédents"</string> <string name="misc_category" msgid="6894192814868233453">"Autres options"</string> <string name="advanced_settings" msgid="362895144495591463">"Paramètres avancés"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Options destinées aux utilisateurs expérimentés"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Plus"</string> <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> <string name="label_wait_key" msgid="6402152600878093134">"Attente"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Le texte actuel est %s"</string> diff --git a/java/res/values-hdpi/config.xml b/java/res/values-hdpi/config.xml index 7333e9449..4cf3562fe 100644 --- a/java/res/values-hdpi/config.xml +++ b/java/res/values-hdpi/config.xml @@ -19,6 +19,12 @@ --> <resources> - <!-- Screen metrics for logging. 0 = "mdpi", 1 = "hdpi", 2 = "xlarge" --> + <!-- Screen metrics for logging. + 0 = "mdpi phone screen" + 1 = "hdpi phone screen" + 2 = "mdpi 11 inch tablet screen" + 3 = "xhdpi phone screen?" + 4 = ? + --> <integer name="log_screen_metrics">1</integer> </resources> diff --git a/java/res/values-hr/strings.xml b/java/res/values-hr/strings.xml index 1f99aef25..5b584d9bd 100644 --- a/java/res/values-hr/strings.xml +++ b/java/res/values-hr/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Povećanja na pritisak tipke"</string> <string name="general_category" msgid="1859088467017573195">"Općenito"</string> <string name="correction_category" msgid="2236750915056607613">"Ispravak teksta"</string> - <string name="ngram_category" msgid="5337109164339320257">"Prijedlozi na temelju prethodnih riječi"</string> <string name="misc_category" msgid="6894192814868233453">"Ostale opcije"</string> <string name="advanced_settings" msgid="362895144495591463">"Napredne postavke"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Opcije za stručne korisnike"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Više"</string> <string name="label_pause_key" msgid="181098308428035340">"Pauza"</string> <string name="label_wait_key" msgid="6402152600878093134">"Pričekaj"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Trenutačni tekst je %s"</string> diff --git a/java/res/values-hu/strings.xml b/java/res/values-hu/strings.xml index 9dbe0f49b..46ced6bd9 100644 --- a/java/res/values-hu/strings.xml +++ b/java/res/values-hu/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Legyen nagyobb billentyű lenyomásakor"</string> <string name="general_category" msgid="1859088467017573195">"Általános"</string> <string name="correction_category" msgid="2236750915056607613">"Szövegjavítás"</string> - <string name="ngram_category" msgid="5337109164339320257">"Javaslatok korábbi szavak alapján"</string> <string name="misc_category" msgid="6894192814868233453">"Egyéb beállítások"</string> <string name="advanced_settings" msgid="362895144495591463">"Speciális beállítások"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Beállítások gyakorlott felhasználóknak"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Egyebek"</string> <string name="label_pause_key" msgid="181098308428035340">"Szün."</string> <string name="label_wait_key" msgid="6402152600878093134">"Vár"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"A jelenlegi szöveg: %s"</string> diff --git a/java/res/values-in/strings.xml b/java/res/values-in/strings.xml index 915ea6d24..acd3bec47 100644 --- a/java/res/values-in/strings.xml +++ b/java/res/values-in/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Muncul saat tombol ditekan"</string> <string name="general_category" msgid="1859088467017573195">"Umum"</string> <string name="correction_category" msgid="2236750915056607613">"Koreksi teks"</string> - <string name="ngram_category" msgid="5337109164339320257">"Saran berdasarkan kata sebelumnya"</string> <string name="misc_category" msgid="6894192814868233453">"Opsi lain"</string> <string name="advanced_settings" msgid="362895144495591463">"Setelan lanjutan"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Pilihan untuk pengguna ahli"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Lainnya"</string> <string name="label_pause_key" msgid="181098308428035340">"Jeda"</string> <string name="label_wait_key" msgid="6402152600878093134">"Tunggu"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Teks saat ini adalah %s"</string> diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml index 823844adf..8e891ab23 100644 --- a/java/res/values-it/strings.xml +++ b/java/res/values-it/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Popup sui tasti"</string> <string name="general_category" msgid="1859088467017573195">"Generali"</string> <string name="correction_category" msgid="2236750915056607613">"Correzione testo"</string> - <string name="ngram_category" msgid="5337109164339320257">"Suggerimenti in base alle parole precedenti"</string> <string name="misc_category" msgid="6894192814868233453">"Altre opzioni"</string> <string name="advanced_settings" msgid="362895144495591463">"Impostazioni avanzate"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Opzioni per utenti esperti"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Altro"</string> <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> <string name="label_wait_key" msgid="6402152600878093134">"Attesa"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Il testo attuale è %s"</string> diff --git a/java/res/values-iw/strings.xml b/java/res/values-iw/strings.xml index 2466d1c87..2354c2f00 100644 --- a/java/res/values-iw/strings.xml +++ b/java/res/values-iw/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"חלון קופץ בלחיצה על מקש"</string> <string name="general_category" msgid="1859088467017573195">"כללי"</string> <string name="correction_category" msgid="2236750915056607613">"תיקון טקסט"</string> - <string name="ngram_category" msgid="5337109164339320257">"הצעות המבוססות על מילים קודמות"</string> <string name="misc_category" msgid="6894192814868233453">"אפשרויות אחרות"</string> <string name="advanced_settings" msgid="362895144495591463">"הגדרות מתקדמות"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"אפשרויות עבור משתמשים מתקדמים"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"אבג"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"עוד"</string> <string name="label_pause_key" msgid="181098308428035340">"השהה"</string> <string name="label_wait_key" msgid="6402152600878093134">"המתן"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"הטקסט הנוכחי הוא %s"</string> diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml index 69c8bd4ec..673656f83 100644 --- a/java/res/values-ja/strings.xml +++ b/java/res/values-ja/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"キー押下時ポップアップ"</string> <string name="general_category" msgid="1859088467017573195">"全般"</string> <string name="correction_category" msgid="2236750915056607613">"テキストの修正"</string> - <string name="ngram_category" msgid="5337109164339320257">"前の語句に基づいた入力候補表示"</string> <string name="misc_category" msgid="6894192814868233453">"他のオプション"</string> <string name="advanced_settings" msgid="362895144495591463">"詳細設定"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"上級ユーザー向けオプション"</string> @@ -71,7 +70,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Shift"</string> <string name="label_pause_key" msgid="181098308428035340">"停止"</string> <string name="label_wait_key" msgid="6402152600878093134">"待機"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"現在のテキスト:%s"</string> diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml index e4da0acc8..997fb8ea2 100644 --- a/java/res/values-ko/strings.xml +++ b/java/res/values-ko/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"키를 누를 때 팝업"</string> <string name="general_category" msgid="1859088467017573195">"일반"</string> <string name="correction_category" msgid="2236750915056607613">"텍스트 수정"</string> - <string name="ngram_category" msgid="5337109164339320257">"이전 단어에 기반한 추천"</string> <string name="misc_category" msgid="6894192814868233453">"기타 옵션"</string> <string name="advanced_settings" msgid="362895144495591463">"고급 설정"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"전문 사용자용 옵션"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"더보기"</string> <string name="label_pause_key" msgid="181098308428035340">"일시 중지"</string> <string name="label_wait_key" msgid="6402152600878093134">"대기"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"입력한 텍스트: %s"</string> diff --git a/java/res/values-lt/strings.xml b/java/res/values-lt/strings.xml index a360ff0f1..d0a885290 100644 --- a/java/res/values-lt/strings.xml +++ b/java/res/values-lt/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Iššoka paspaudus klavišą"</string> <string name="general_category" msgid="1859088467017573195">"Bendra"</string> <string name="correction_category" msgid="2236750915056607613">"Teksto taisymas"</string> - <string name="ngram_category" msgid="5337109164339320257">"Pasiūlymai pagal ankstesnius žodžius"</string> <string name="misc_category" msgid="6894192814868233453">"Kitos parinktys"</string> <string name="advanced_settings" msgid="362895144495591463">"Išplėstiniai nustatymai"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Parinktys ekspertams"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Daugiau"</string> <string name="label_pause_key" msgid="181098308428035340">"Prist."</string> <string name="label_wait_key" msgid="6402152600878093134">"Lauk."</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Dabartinis tekstas yra %s"</string> diff --git a/java/res/values-lv/strings.xml b/java/res/values-lv/strings.xml index eb53faa0f..ba806e589 100644 --- a/java/res/values-lv/strings.xml +++ b/java/res/values-lv/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Nospiežot taustiņu, parādīt uznirstošo izvēlni"</string> <string name="general_category" msgid="1859088467017573195">"Vispārīgi"</string> <string name="correction_category" msgid="2236750915056607613">"Teksta korekcija"</string> - <string name="ngram_category" msgid="5337109164339320257">"Ieteikumi, kuru pamatā ir iepriekšējie vārdi"</string> <string name="misc_category" msgid="6894192814868233453">"Citas opcijas"</string> <string name="advanced_settings" msgid="362895144495591463">"Papildu iestatījumi"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Opcijas speciālistiem"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Vairāk"</string> <string name="label_pause_key" msgid="181098308428035340">"Pauze"</string> <string name="label_wait_key" msgid="6402152600878093134">"Gaidīt"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Pašreizējais teksts ir %s"</string> diff --git a/java/res/values-ms/strings.xml b/java/res/values-ms/strings.xml index 44289b97c..60c8f4df2 100644 --- a/java/res/values-ms/strings.xml +++ b/java/res/values-ms/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Pop timbul pada tekanan kunci"</string> <string name="general_category" msgid="1859088467017573195">"Umum"</string> <string name="correction_category" msgid="2236750915056607613">"Pembetulan teks"</string> - <string name="ngram_category" msgid="5337109164339320257">"Cadangan berdasarkan perkataan sebelumnya"</string> <string name="misc_category" msgid="6894192814868233453">"Pilihan lain"</string> <string name="advanced_settings" msgid="362895144495591463">"Tetapan terperinci"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Pilihan untuk pengguna pakar"</string> @@ -70,7 +69,6 @@ <!-- no translation found for label_to_symbol_key (8516904117128967293) --> <skip /> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Lagi"</string> <string name="label_pause_key" msgid="181098308428035340">"Jeda"</string> <string name="label_wait_key" msgid="6402152600878093134">"Tnggu"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Teks semasa adalah %s"</string> diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml index 70b90ca66..563c61cc6 100644 --- a/java/res/values-nb/strings.xml +++ b/java/res/values-nb/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Hurtigvindu ved tastetrykk"</string> <string name="general_category" msgid="1859088467017573195">"Generelt"</string> <string name="correction_category" msgid="2236750915056607613">"Tekstkorrigering"</string> - <string name="ngram_category" msgid="5337109164339320257">"Forslag basert på tidligere ord"</string> <string name="misc_category" msgid="6894192814868233453">"Andre alternativer"</string> <string name="advanced_settings" msgid="362895144495591463">"Avanserte innstillinger"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Alternativer for ekspertbrukere"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Mer"</string> <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> <string name="label_wait_key" msgid="6402152600878093134">"Vent"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Gjeldende tekst er %s"</string> diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml index c33796c07..bc15920fc 100644 --- a/java/res/values-nl/strings.xml +++ b/java/res/values-nl/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Pop-up bij toetsaanslag"</string> <string name="general_category" msgid="1859088467017573195">"Algemeen"</string> <string name="correction_category" msgid="2236750915056607613">"Tekstcorrectie"</string> - <string name="ngram_category" msgid="5337109164339320257">"Suggesties op basis van eerdere woorden"</string> <string name="misc_category" msgid="6894192814868233453">"Andere opties"</string> <string name="advanced_settings" msgid="362895144495591463">"Geavanceerde instellingen"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Opties voor ervaren gebruikers"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Meer"</string> <string name="label_pause_key" msgid="181098308428035340">"Onderbr."</string> <string name="label_wait_key" msgid="6402152600878093134">"Wacht"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Huidige tekst is %s"</string> diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml index 1fd399cd9..6f42fde70 100644 --- a/java/res/values-pl/strings.xml +++ b/java/res/values-pl/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Powiększ po naciśnięciu"</string> <string name="general_category" msgid="1859088467017573195">"Ogólne"</string> <string name="correction_category" msgid="2236750915056607613">"Poprawianie tekstu"</string> - <string name="ngram_category" msgid="5337109164339320257">"Podpowiedzi na podstawie wcześniejszych słów"</string> <string name="misc_category" msgid="6894192814868233453">"Inne opcje"</string> <string name="advanced_settings" msgid="362895144495591463">"Ustawienia zaawansowane"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Opcje dla zaawansowanych użytkowników"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Więcej"</string> <string name="label_pause_key" msgid="181098308428035340">"Pauza"</string> <string name="label_wait_key" msgid="6402152600878093134">"Czekaj"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Aktualny tekst: %s"</string> diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml index 814d47775..3be35dfb7 100644 --- a/java/res/values-pt-rPT/strings.xml +++ b/java/res/values-pt-rPT/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Mostrar popup ao premir tecla"</string> <string name="general_category" msgid="1859088467017573195">"Geral"</string> <string name="correction_category" msgid="2236750915056607613">"Correção de texto"</string> - <string name="ngram_category" msgid="5337109164339320257">"Sugestões baseadas em palavras anteriores"</string> <string name="misc_category" msgid="6894192814868233453">"Outras opções"</string> <string name="advanced_settings" msgid="362895144495591463">"Definições avançadas"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Opções para utilizadores experientes"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Mais"</string> <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> <string name="label_wait_key" msgid="6402152600878093134">"Esp."</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"O texto atual é %s"</string> diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml index aebfb1ee5..33cfb9c9e 100644 --- a/java/res/values-pt/strings.xml +++ b/java/res/values-pt/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Exibir pop-up ao digitar"</string> <string name="general_category" msgid="1859088467017573195">"Geral"</string> <string name="correction_category" msgid="2236750915056607613">"Correção de texto"</string> - <string name="ngram_category" msgid="5337109164339320257">"Sugestões baseadas em palavras anteriores"</string> <string name="misc_category" msgid="6894192814868233453">"Outras opções"</string> <string name="advanced_settings" msgid="362895144495591463">"Configurações avançadas"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Opções para usuários experientes"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Mais"</string> <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> <string name="label_wait_key" msgid="6402152600878093134">"Esp."</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"O texto atual é %s"</string> diff --git a/java/res/values-rm/strings.xml b/java/res/values-rm/strings.xml index 549a2b447..e5aa0dcd8 100644 --- a/java/res/values-rm/strings.xml +++ b/java/res/values-rm/strings.xml @@ -39,8 +39,6 @@ <skip /> <!-- no translation found for correction_category (2236750915056607613) --> <skip /> - <!-- no translation found for ngram_category (5337109164339320257) --> - <skip /> <!-- no translation found for misc_category (6894192814868233453) --> <skip /> <!-- no translation found for advanced_settings (362895144495591463) --> @@ -103,8 +101,6 @@ <skip /> <!-- no translation found for label_to_symbol_with_microphone_key (9035925553010061906) --> <skip /> - <!-- no translation found for label_more_key (3760239494604948502) --> - <skip /> <!-- no translation found for label_pause_key (181098308428035340) --> <skip /> <!-- no translation found for label_wait_key (6402152600878093134) --> diff --git a/java/res/values-ro/strings.xml b/java/res/values-ro/strings.xml index cb6d62816..8acfe8ab7 100644 --- a/java/res/values-ro/strings.xml +++ b/java/res/values-ro/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Fereastră pop-up la apăsarea tastei"</string> <string name="general_category" msgid="1859088467017573195">"General"</string> <string name="correction_category" msgid="2236750915056607613">"Corectare text"</string> - <string name="ngram_category" msgid="5337109164339320257">"Sugestii bazate pe cuvinte anterioare"</string> <string name="misc_category" msgid="6894192814868233453">"Alte opţiuni"</string> <string name="advanced_settings" msgid="362895144495591463">"Setări avansate"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Opţiuni pt. utiliz. experţi"</string> @@ -71,7 +70,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Mai multe"</string> <string name="label_pause_key" msgid="181098308428035340">"Pauză"</string> <string name="label_wait_key" msgid="6402152600878093134">"Aşt."</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Textul curent este %s"</string> diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml index 24d05e080..9cddbc342 100644 --- a/java/res/values-ru/strings.xml +++ b/java/res/values-ru/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Увеличение нажатых"</string> <string name="general_category" msgid="1859088467017573195">"Общие"</string> <string name="correction_category" msgid="2236750915056607613">"Исправление текста"</string> - <string name="ngram_category" msgid="5337109164339320257">"Подсказки, основанные на предыдущих словах"</string> <string name="misc_category" msgid="6894192814868233453">"Другие варианты"</string> <string name="advanced_settings" msgid="362895144495591463">"Расширенные настройки"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Для опытных пользователей"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"АБВ"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Ещё"</string> <string name="label_pause_key" msgid="181098308428035340">"Приостановить"</string> <string name="label_wait_key" msgid="6402152600878093134">"Подождите"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Введенный текст: %s."</string> diff --git a/java/res/values-sk/strings.xml b/java/res/values-sk/strings.xml index 38ea5d33b..d04ae83e8 100644 --- a/java/res/values-sk/strings.xml +++ b/java/res/values-sk/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Zobraziť znaky pri stlačení klávesu"</string> <string name="general_category" msgid="1859088467017573195">"Všeobecné"</string> <string name="correction_category" msgid="2236750915056607613">"Oprava textu"</string> - <string name="ngram_category" msgid="5337109164339320257">"Návrhy na základe predchádzajúcich slov"</string> <string name="misc_category" msgid="6894192814868233453">"Ďalšie možnosti"</string> <string name="advanced_settings" msgid="362895144495591463">"Rozšírené nastavenia"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Možnosti pre skúsených používateľov"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Viac"</string> <string name="label_pause_key" msgid="181098308428035340">"Pozastaviť"</string> <string name="label_wait_key" msgid="6402152600878093134">"Čakajte"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Aktuálny text je %s"</string> diff --git a/java/res/values-sl/strings.xml b/java/res/values-sl/strings.xml index c7c2abff2..d8a45cc1c 100644 --- a/java/res/values-sl/strings.xml +++ b/java/res/values-sl/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Pojavno okno ob pritisku tipke"</string> <string name="general_category" msgid="1859088467017573195">"Splošno"</string> <string name="correction_category" msgid="2236750915056607613">"Popravek besedila"</string> - <string name="ngram_category" msgid="5337109164339320257">"Predlogi, ki temeljijo na prejšnjih besedah"</string> <string name="misc_category" msgid="6894192814868233453">"Druge možnosti"</string> <string name="advanced_settings" msgid="362895144495591463">"Dodatne nastavitve"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Možnosti za izkušene uporabnike"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Več"</string> <string name="label_pause_key" msgid="181098308428035340">"Premor"</string> <string name="label_wait_key" msgid="6402152600878093134">"Čakaj"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Trenutno besedilo je %s"</string> diff --git a/java/res/values-sr/strings.xml b/java/res/values-sr/strings.xml index 46f699e24..92699540b 100644 --- a/java/res/values-sr/strings.xml +++ b/java/res/values-sr/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Искачући прозор приликом притиска тастера"</string> <string name="general_category" msgid="1859088467017573195">"Опште"</string> <string name="correction_category" msgid="2236750915056607613">"Исправљање текста"</string> - <string name="ngram_category" msgid="5337109164339320257">"Предлози на основу претходних речи"</string> <string name="misc_category" msgid="6894192814868233453">"Друге опције"</string> <string name="advanced_settings" msgid="362895144495591463">"Напредна подешавања"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Опције за искусне кориснике"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Још"</string> <string name="label_pause_key" msgid="181098308428035340">"Паузирај"</string> <string name="label_wait_key" msgid="6402152600878093134">"Сачекајте"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Тренутни текст је %s"</string> diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml index fde901a32..025058a69 100644 --- a/java/res/values-sv/strings.xml +++ b/java/res/values-sv/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Popup vid knapptryck"</string> <string name="general_category" msgid="1859088467017573195">"Allmänt"</string> <string name="correction_category" msgid="2236750915056607613">"Textkorrigering"</string> - <string name="ngram_category" msgid="5337109164339320257">"Förslag baserade på tidigare ord"</string> <string name="misc_category" msgid="6894192814868233453">"Andra alternativ"</string> <string name="advanced_settings" msgid="362895144495591463">"Avancerade inställningar"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Alternativ för expertanvändare"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Mer"</string> <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> <string name="label_wait_key" msgid="6402152600878093134">"Vänta"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Nuvarande text är %s"</string> diff --git a/java/res/values-sw/strings.xml b/java/res/values-sw/strings.xml index 174ddff9d..a11eba625 100644 --- a/java/res/values-sw/strings.xml +++ b/java/res/values-sw/strings.xml @@ -35,8 +35,6 @@ <skip /> <!-- no translation found for correction_category (2236750915056607613) --> <skip /> - <!-- no translation found for ngram_category (5337109164339320257) --> - <skip /> <!-- no translation found for misc_category (6894192814868233453) --> <skip /> <!-- no translation found for advanced_settings (362895144495591463) --> @@ -86,7 +84,6 @@ <!-- no translation found for label_to_symbol_key (8516904117128967293) --> <skip /> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Zaidi"</string> <string name="label_pause_key" msgid="181098308428035340">"Pumzisha"</string> <string name="label_wait_key" msgid="6402152600878093134">"Subiri"</string> <!-- no translation found for spoken_current_text_is (2485723011272583845) --> diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml index a438fe964..c25139a42 100644 --- a/java/res/values-sw768dp/config.xml +++ b/java/res/values-sw768dp/config.xml @@ -38,6 +38,12 @@ <string name="config_default_keyboard_theme_id" translatable="false">5</string> <string name="config_text_size_of_language_on_spacebar" translatable="false">medium</string> <integer name="config_max_more_keys_column">5</integer> - <!-- Screen metrics for logging. 0 = "mdpi", 1 = "hdpi", 2 = "xlarge" --> + <!-- Screen metrics for logging. + 0 = "mdpi phone screen" + 1 = "hdpi phone screen" + 2 = "mdpi 11 inch tablet screen" + 3 = "xhdpi phone screen?" + 4 = ? + --> <integer name="log_screen_metrics">2</integer> </resources> diff --git a/java/res/values-th/strings.xml b/java/res/values-th/strings.xml index a1f816df6..d8966df19 100644 --- a/java/res/values-th/strings.xml +++ b/java/res/values-th/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"ป๊อปอัปเมื่อกดแป้น"</string> <string name="general_category" msgid="1859088467017573195">"ทั่วไป"</string> <string name="correction_category" msgid="2236750915056607613">"การแก้ไขข้อความ"</string> - <string name="ngram_category" msgid="5337109164339320257">"ข้อเสนอแนะตามคำก่อนหน้านี้"</string> <string name="misc_category" msgid="6894192814868233453">"ตัวเลือกอื่นๆ"</string> <string name="advanced_settings" msgid="362895144495591463">"การตั้งค่าขั้นสูง"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"ตัวเลือกสำหรับผู้ใช้ที่มีความเชี่ยวชาญ"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"เพิ่มเติม"</string> <string name="label_pause_key" msgid="181098308428035340">"หยุดชั่วคราว"</string> <string name="label_wait_key" msgid="6402152600878093134">"รอ"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"ข้อความปัจจุบันคือ %s"</string> diff --git a/java/res/values-tl/strings.xml b/java/res/values-tl/strings.xml index dd5ccd1c2..7c778515c 100644 --- a/java/res/values-tl/strings.xml +++ b/java/res/values-tl/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Popup sa keypress"</string> <string name="general_category" msgid="1859088467017573195">"Pangkalahatan"</string> <string name="correction_category" msgid="2236750915056607613">"Pagwawasto ng teksto"</string> - <string name="ngram_category" msgid="5337109164339320257">"Mga suhestiyon batay sa mga nakaraang salita"</string> <string name="misc_category" msgid="6894192814868233453">"Iba pang mga pagpipilian"</string> <string name="advanced_settings" msgid="362895144495591463">"Mga advanced na setting"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Mga pagpipilian para sa mga ekspertong user"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Higit pa"</string> <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> <string name="label_wait_key" msgid="6402152600878093134">"Intay"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Ang kasalukuyang teksto ay %s"</string> diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml index 69a843574..90678673c 100644 --- a/java/res/values-tr/strings.xml +++ b/java/res/values-tr/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Tuşa basıldığında pop-up aç"</string> <string name="general_category" msgid="1859088467017573195">"Genel"</string> <string name="correction_category" msgid="2236750915056607613">"Metin düzeltme"</string> - <string name="ngram_category" msgid="5337109164339320257">"Önceki kelimelere dayalı öneriler"</string> <string name="misc_category" msgid="6894192814868233453">"Diğer seçenekler"</string> <string name="advanced_settings" msgid="362895144495591463">"Gelişmiş ayarlar"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Uzman kullanıcılar için seçenekler"</string> @@ -71,7 +70,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Diğer"</string> <string name="label_pause_key" msgid="181098308428035340">"Durkl"</string> <string name="label_wait_key" msgid="6402152600878093134">"Bekle"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Mevcut metin: %s"</string> diff --git a/java/res/values-uk/strings.xml b/java/res/values-uk/strings.xml index 73c945a5f..6a3c6632b 100644 --- a/java/res/values-uk/strings.xml +++ b/java/res/values-uk/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Сплив. при нат.клав."</string> <string name="general_category" msgid="1859088467017573195">"Загальні"</string> <string name="correction_category" msgid="2236750915056607613">"Виправлення тексту"</string> - <string name="ngram_category" msgid="5337109164339320257">"Пропозиції на основі попередніх слів"</string> <string name="misc_category" msgid="6894192814868233453">"Інші опції"</string> <string name="advanced_settings" msgid="362895144495591463">"Розширені налаштування"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Налаштування для досвідчених користувачів"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"Алфавіт"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Більше"</string> <string name="label_pause_key" msgid="181098308428035340">"Пауза"</string> <string name="label_wait_key" msgid="6402152600878093134">"Чек."</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Поточний текст – %s."</string> diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml index d58daf3a3..d9684f26f 100644 --- a/java/res/values-vi/strings.xml +++ b/java/res/values-vi/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Cửa sổ bật lên khi nhấn phím"</string> <string name="general_category" msgid="1859088467017573195">"Chung"</string> <string name="correction_category" msgid="2236750915056607613">"Sửa văn bản"</string> - <string name="ngram_category" msgid="5337109164339320257">"Đề xuất dựa trên các từ trước đó"</string> <string name="misc_category" msgid="6894192814868233453">"Tùy chọn khác"</string> <string name="advanced_settings" msgid="362895144495591463">"Cài đặt nâng cao"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"Tùy chọn cho người dùng chuyên gia"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Khác"</string> <string name="label_pause_key" msgid="181098308428035340">"Tạm dừng"</string> <string name="label_wait_key" msgid="6402152600878093134">"Đợi"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Ký tự hiện tại là %s"</string> diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml index 316aca73e..8478e3354 100644 --- a/java/res/values-zh-rCN/strings.xml +++ b/java/res/values-zh-rCN/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"按键时显示弹出窗口"</string> <string name="general_category" msgid="1859088467017573195">"常规"</string> <string name="correction_category" msgid="2236750915056607613">"文本更正"</string> - <string name="ngram_category" msgid="5337109164339320257">"根据前面的字词提供建议"</string> <string name="misc_category" msgid="6894192814868233453">"其他选项"</string> <string name="advanced_settings" msgid="362895144495591463">"高级设置"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"适合专家级用户的选项"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"更多"</string> <string name="label_pause_key" msgid="181098308428035340">"暂停"</string> <string name="label_wait_key" msgid="6402152600878093134">"等待"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"当前文本为%s"</string> diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml index e8bdceb04..1df08542e 100644 --- a/java/res/values-zh-rTW/strings.xml +++ b/java/res/values-zh-rTW/strings.xml @@ -32,7 +32,6 @@ <string name="popup_on_keypress" msgid="123894815723512944">"按鍵時顯示彈出式視窗"</string> <string name="general_category" msgid="1859088467017573195">"一般設定"</string> <string name="correction_category" msgid="2236750915056607613">"文字修正"</string> - <string name="ngram_category" msgid="5337109164339320257">"根據先前字詞產生的建議"</string> <string name="misc_category" msgid="6894192814868233453">"其他選項"</string> <string name="advanced_settings" msgid="362895144495591463">"進階設定"</string> <string name="advanced_settings_summary" msgid="5193513161106637254">"提供給專業使用者的選項"</string> @@ -69,7 +68,6 @@ <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"？123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"更多"</string> <string name="label_pause_key" msgid="181098308428035340">"暫停"</string> <string name="label_wait_key" msgid="6402152600878093134">"等候"</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"目前文字為 %s"</string> diff --git a/java/res/values-zu/strings.xml b/java/res/values-zu/strings.xml index a190b0f5c..e178d4616 100644 --- a/java/res/values-zu/strings.xml +++ b/java/res/values-zu/strings.xml @@ -35,8 +35,6 @@ <skip /> <!-- no translation found for correction_category (2236750915056607613) --> <skip /> - <!-- no translation found for ngram_category (5337109164339320257) --> - <skip /> <!-- no translation found for misc_category (6894192814868233453) --> <skip /> <!-- no translation found for advanced_settings (362895144495591463) --> @@ -86,7 +84,6 @@ <!-- no translation found for label_to_symbol_key (8516904117128967293) --> <skip /> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> - <string name="label_more_key" msgid="3760239494604948502">"Okungaphezulu"</string> <string name="label_pause_key" msgid="181098308428035340">"Misa okwesikhashana"</string> <string name="label_wait_key" msgid="6402152600878093134">"Linda"</string> <!-- no translation found for spoken_current_text_is (2485723011272583845) --> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index a456b221b..a876e2889 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -217,6 +217,7 @@ <flag name="hasHintLabel" value="0x800" /> <flag name="withIconLeft" value="0x1000" /> <flag name="withIconRight" value="0x2000" /> + <flag name="autoXScale" value="0x4000" /> </attr> <!-- The icon to display on the key instead of the label. --> <attr name="keyIcon" format="enum"> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index 194f2ed42..b512789e6 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -83,7 +83,13 @@ </string-array> <!-- Threshold of the normalized score of the best suggestion for the spell checker to declare a word to be a typo --> <string name="spellchecker_typo_threshold_value">0.11</string> - <!-- Screen metrics for logging. 0 = "mdpi", 1 = "hdpi", 2 = "xlarge" --> + <!-- Screen metrics for logging. + 0 = "mdpi phone screen" + 1 = "hdpi phone screen" + 2 = "mdpi 11 inch tablet screen" + 3 = "xhdpi phone screen?" + 4 = ? + --> <integer name="log_screen_metrics">0</integer> <bool name="config_require_umlaut_processing">false</bool> </resources> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 37cb23b70..acc6e5882 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -52,9 +52,6 @@ <!-- Category title for text prediction --> <string name="correction_category">Text correction</string> - <!-- Category title for ngrams --> - <string name="ngram_category">Suggestions based on previous words</string> - <!-- Category title for misc options --> <string name="misc_category">Other options</string> @@ -138,8 +135,6 @@ <!-- Label for "switch to symbols with microphone" key. This string shouldn't include the "mic" part because it'll be appended by the code. Must be short to fit on key! [CHAR LIMIT=3] --> <string name="label_to_symbol_with_microphone_key">123</string> - <!-- Label for Shift modifier key of symbol keyboard. Must be short to fit on key! [CHAR LIMIT=5] --> - <string name="label_more_key">More</string> <!-- Label for "Pause" key of phone number keyboard. Must be short to fit on key! [CHAR LIMIT=5] --> <string name="label_pause_key">Pause</string> <!-- Label for "Wait" key of phone number keyboard. Must be short to fit on key! [CHAR LIMIT=5]--> diff --git a/java/res/xml-sw600dp-land/kbd_popup_template.xml b/java/res/xml-sw600dp-land/kbd_mini_keyboard_template.xml index 2c1d1902e..3c19c294d 100644 --- a/java/res/xml-sw600dp-land/kbd_popup_template.xml +++ b/java/res/xml-sw600dp-land/kbd_mini_keyboard_template.xml @@ -20,8 +20,6 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:keyWidth="5%p" - latin:horizontalGap="0px" - latin:verticalGap="0px" latin:rowHeight="@dimen/popup_key_height" > </Keyboard> diff --git a/java/res/xml-sw600dp/kbd_phone_shift.xml b/java/res/xml-sw600dp/kbd_phone_shift.xml index 2b6936dce..4c4f8ad12 100644 --- a/java/res/xml-sw600dp/kbd_phone_shift.xml +++ b/java/res/xml-sw600dp/kbd_phone_shift.xml @@ -41,6 +41,7 @@ <Key latin:code="44" latin:keyLabel="@string/label_pause_key" + latin:keyLabelOption="followKeyHintLabelRatio|autoXScale" latin:keyWidth="9.25%p" /> <Key latin:keyStyle="num1KeyStyle" @@ -69,6 +70,7 @@ <Key latin:code="59" latin:keyLabel="@string/label_wait_key" + latin:keyLabelOption="followKeyHintLabelRatio|autoXScale" latin:keyWidth="9.25%p" /> <Key latin:keyStyle="num4KeyStyle" diff --git a/java/res/xml-sw768dp-land/kbd_popup_template.xml b/java/res/xml-sw768dp-land/kbd_mini_keyboard_template.xml index 3caae1a60..d5f80e76d 100644 --- a/java/res/xml-sw768dp-land/kbd_popup_template.xml +++ b/java/res/xml-sw768dp-land/kbd_mini_keyboard_template.xml @@ -20,8 +20,6 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:keyWidth="3.5%p" - latin:horizontalGap="0px" - latin:verticalGap="0px" latin:rowHeight="@dimen/popup_key_height" > </Keyboard> diff --git a/java/res/xml-sw768dp/kbd_phone_shift.xml b/java/res/xml-sw768dp/kbd_phone_shift.xml index 646f0b867..46f67d311 100644 --- a/java/res/xml-sw768dp/kbd_phone_shift.xml +++ b/java/res/xml-sw768dp/kbd_phone_shift.xml @@ -43,6 +43,7 @@ <Key latin:code="44" latin:keyLabel="@string/label_pause_key" + latin:keyLabelOption="followKeyHintLabelRatio|autoXScale" latin:keyWidth="8.047%p" /> <Key latin:keyStyle="num1KeyStyle" @@ -72,6 +73,7 @@ <Key latin:code="59" latin:keyLabel="@string/label_wait_key" + latin:keyLabelOption="followKeyHintLabelRatio|autoXScale" latin:keyWidth="8.047%p" /> <Key latin:keyStyle="num4KeyStyle" diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml index 12eab22b9..84b1900f0 100644 --- a/java/res/xml/kbd_key_styles.xml +++ b/java/res/xml/kbd_key_styles.xml @@ -101,6 +101,7 @@ latin:styleName="returnKeyStyle" latin:code="@integer/key_return" latin:keyLabel="@string/label_go_key" + latin:keyLabelOption="autoXScale" latin:parentStyle="functionalKeyStyle" /> </case> <case @@ -110,6 +111,7 @@ latin:styleName="returnKeyStyle" latin:code="@integer/key_return" latin:keyLabel="@string/label_next_key" + latin:keyLabelOption="autoXScale" latin:parentStyle="functionalKeyStyle" /> </case> <case @@ -119,6 +121,7 @@ latin:styleName="returnKeyStyle" latin:code="@integer/key_return" latin:keyLabel="@string/label_done_key" + latin:keyLabelOption="autoXScale" latin:parentStyle="functionalKeyStyle" /> </case> <case @@ -128,6 +131,7 @@ latin:styleName="returnKeyStyle" latin:code="@integer/key_return" latin:keyLabel="@string/label_send_key" + latin:keyLabelOption="autoXScale" latin:parentStyle="functionalKeyStyle" /> </case> <case diff --git a/java/res/xml/kbd_phone_shift.xml b/java/res/xml/kbd_phone_shift.xml index 89a9bd058..5be9bf9a9 100644 --- a/java/res/xml/kbd_phone_shift.xml +++ b/java/res/xml/kbd_phone_shift.xml @@ -49,7 +49,7 @@ <Key latin:code="44" latin:keyLabel="@string/label_pause_key" - latin:keyLabelOption="followKeyHintLabelRatio" /> + latin:keyLabelOption="followKeyHintLabelRatio|autoXScale" /> <Key latin:keyLabel="," latin:keyStyle="numKeyStyle" /> @@ -65,7 +65,7 @@ <Key latin:code="59" latin:keyLabel="@string/label_wait_key" - latin:keyLabelOption="followKeyHintLabelRatio" /> + latin:keyLabelOption="followKeyHintLabelRatio|autoXScale" /> <Key latin:keyLabel="#" latin:keyStyle="numKeyStyle" /> diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java index 4ccb27e4c..06d248e3a 100644 --- a/java/src/com/android/inputmethod/keyboard/Key.java +++ b/java/src/com/android/inputmethod/keyboard/Key.java @@ -64,6 +64,7 @@ public class Key { private static final int LABEL_OPTION_HAS_HINT_LABEL = 0x800; private static final int LABEL_OPTION_WITH_ICON_LEFT = 0x1000; private static final int LABEL_OPTION_WITH_ICON_RIGHT = 0x2000; + private static final int LABEL_OPTION_AUTO_X_SCALE = 0x4000; /** Icon to display instead of a label. Icon takes precedence over a label */ private Drawable mIcon; @@ -439,6 +440,10 @@ public class Key { return (mLabelOption & LABEL_OPTION_WITH_ICON_RIGHT) != 0; } + public boolean needsXScale() { + return (mLabelOption & LABEL_OPTION_AUTO_X_SCALE) != 0; + } + public Drawable getIcon() { return mIcon; } diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java index acb76cc78..5a44460a1 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java @@ -91,6 +91,9 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { // TODO: Use resource parameter for this value. private static final float LABEL_ICON_MARGIN = 0.05f; + // The maximum key label width in the proportion to the key width. + private static final float MAX_LABEL_RATIO = 0.90f; + // Main keyboard private Keyboard mKeyboard; private final KeyDrawParams mKeyDrawParams; @@ -572,18 +575,22 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { paint.setTextAlign(Align.LEFT); } else if (key.hasLabelWithIconLeft() && icon != null) { labelWidth = getLabelWidth(label, paint) + icon.getIntrinsicWidth() - + (int)(LABEL_ICON_MARGIN * keyWidth); + + LABEL_ICON_MARGIN * keyWidth; positionX = centerX + labelWidth / 2; paint.setTextAlign(Align.RIGHT); } else if (key.hasLabelWithIconRight() && icon != null) { labelWidth = getLabelWidth(label, paint) + icon.getIntrinsicWidth() - + (int)(LABEL_ICON_MARGIN * keyWidth); + + LABEL_ICON_MARGIN * keyWidth; positionX = centerX - labelWidth / 2; paint.setTextAlign(Align.LEFT); } else { positionX = centerX; paint.setTextAlign(Align.CENTER); } + if (key.needsXScale()) { + paint.setTextScaleX( + Math.min(1.0f, (keyWidth * MAX_LABEL_RATIO) / getLabelWidth(label, paint))); + } if (key.hasUppercaseLetter() && isManualTemporaryUpperCase) { paint.setColor(params.mKeyTextInactivatedColor); @@ -598,8 +605,9 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { paint.setColor(Color.TRANSPARENT); } canvas.drawText(label, 0, label.length(), positionX, baseline, paint); - // Turn off drop shadow + // Turn off drop shadow and reset x-scale. paint.setShadowLayer(0, 0, 0, 0); + paint.setTextScaleX(1.0f); if (icon != null) { final int iconWidth = icon.getIntrinsicWidth(); diff --git a/java/src/com/android/inputmethod/latin/Utils.java b/java/src/com/android/inputmethod/latin/Utils.java index 6263ebefa..c35273edd 100644 --- a/java/src/com/android/inputmethod/latin/Utils.java +++ b/java/src/com/android/inputmethod/latin/Utils.java @@ -757,10 +757,19 @@ public class Utils { return toTitleCase(locale.getLanguage(), locale); } - private static String toTitleCase(String s, Locale locale) { + public static String toTitleCase(String s, Locale locale) { if (s.length() <= 1) { + // TODO: is this really correct? Shouldn't this be s.toUpperCase()? return s; } + // TODO: fix the bugs below + // - This does not work for Greek, because it returns upper case instead of title case. + // - It does not work for Serbian, because it fails to account for the "lj" character, + // which should be "Lj" in title case and "LJ" in upper case. + // - It does not work for Dutch, because it fails to account for the "ij" digraph, which + // are two different characters but both should be capitalized as "IJ" as if they were + // a single letter. + // - It also does not work with unicode surrogate code points. return s.toUpperCase(locale).charAt(0) + s.substring(1); } } diff --git a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java index ae47ab22b..3cf8788aa 100644 --- a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java +++ b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java @@ -55,6 +55,10 @@ public class AndroidSpellCheckerService extends SpellCheckerService { private static final boolean DBG = false; private static final int POOL_SIZE = 2; + private static final int CAPITALIZE_NONE = 0; // No caps, or mixed case + private static final int CAPITALIZE_FIRST = 1; // First only + private static final int CAPITALIZE_ALL = 2; // All caps + private final static String[] EMPTY_STRING_ARRAY = new String[0]; private final static SuggestionsInfo EMPTY_SUGGESTIONS_INFO = new SuggestionsInfo(0, EMPTY_STRING_ARRAY); @@ -139,7 +143,8 @@ public class AndroidSpellCheckerService extends SpellCheckerService { return true; } - public Result getResults(final CharSequence originalText, final double threshold) { + public Result getResults(final CharSequence originalText, final double threshold, + final int capitalizeType, final Locale locale) { final String[] gatheredSuggestions; final boolean looksLikeTypo; if (0 == mLength) { @@ -166,6 +171,19 @@ public class AndroidSpellCheckerService extends SpellCheckerService { } Collections.reverse(mSuggestions); Utils.removeDupes(mSuggestions); + if (CAPITALIZE_ALL == capitalizeType) { + for (int i = 0; i < mSuggestions.size(); ++i) { + // get(i) returns a CharSequence which is actually a String so .toString() + // should return the same object. + mSuggestions.set(i, mSuggestions.get(i).toString().toUpperCase(locale)); + } + } else if (CAPITALIZE_FIRST == capitalizeType) { + for (int i = 0; i < mSuggestions.size(); ++i) { + // Likewise + mSuggestions.set(i, Utils.toTitleCase(mSuggestions.get(i).toString(), + locale)); + } + } // This returns a String[], while toArray() returns an Object[] which cannot be cast // into a String[]. gatheredSuggestions = mSuggestions.toArray(EMPTY_STRING_ARRAY); @@ -226,6 +244,25 @@ public class AndroidSpellCheckerService extends SpellCheckerService { return new DictAndProximity(dictionaryCollection, proximityInfo); } + // This method assumes the text is not empty or null. + private static int getCapitalizationType(String text) { + // If the first char is not uppercase, then the word is either all lower case, + // and in either case we return CAPITALIZE_NONE. + if (!Character.isUpperCase(text.codePointAt(0))) return CAPITALIZE_NONE; + final int len = text.codePointCount(0, text.length()); + int capsCount = 1; + for (int i = 1; i < len; ++i) { + if (1 != capsCount && i != capsCount) break; + if (Character.isUpperCase(text.codePointAt(i))) ++capsCount; + } + // We know the first char is upper case. So we want to test if either everything + // else is lower case, or if everything else is upper case. If the string is + // exactly one char long, then we will arrive here with capsCount 1, and this is + // correct, too. + if (1 == capsCount) return CAPITALIZE_FIRST; + return (len == capsCount ? CAPITALIZE_ALL : CAPITALIZE_NONE); + } + private static class AndroidSpellCheckerSession extends Session { // Immutable, but need the locale which is not available in the constructor yet private DictionaryPool mDictionaryPool; @@ -276,31 +313,18 @@ public class AndroidSpellCheckerService extends SpellCheckerService { WordComposer.NOT_A_COORDINATE, WordComposer.NOT_A_COORDINATE); } + final int capitalizeType = getCapitalizationType(text); boolean isInDict = true; try { final DictAndProximity dictInfo = mDictionaryPool.take(); dictInfo.mDictionary.getWords(composer, suggestionsGatherer, dictInfo.mProximityInfo); isInDict = dictInfo.mDictionary.isValidWord(text); - if (!isInDict && Character.isUpperCase(text.codePointAt(0))) { - // If the first char is not uppercase, then the word is either all lower case, - // in which case we already tested it, or mixed case, in which case we don't - // want to test a lower-case version of it. Hence the test above. - // Also note that by isEmpty() test at the top of the method codePointAt(0) is - // guaranteed to be there. - final int len = text.codePointCount(0, text.length()); - int capsCount = 1; - for (int i = 1; i < len; ++i) { - if (1 != capsCount && i != capsCount) break; - if (Character.isUpperCase(text.codePointAt(i))) ++capsCount; - } - // We know the first char is upper case. So we want to test if either everything - // else is lower case, or if everything else is upper case. If the string is - // exactly one char long, then we will arrive here with capsCount 0, and this is - // correct, too. - if (1 == capsCount || len == capsCount) { - isInDict = dictInfo.mDictionary.isValidWord(text.toLowerCase(mLocale)); - } + if (!isInDict && CAPITALIZE_NONE != capitalizeType) { + // We want to test the word again if it's all caps or first caps only. + // If it's fully down, we already tested it, if it's mixed case, we don't + // want to test a lowercase version of it. + isInDict = dictInfo.mDictionary.isValidWord(text.toLowerCase(mLocale)); } if (!mDictionaryPool.offer(dictInfo)) { Log.e(TAG, "Can't re-insert a dictionary into its pool"); @@ -310,8 +334,8 @@ public class AndroidSpellCheckerService extends SpellCheckerService { return EMPTY_SUGGESTIONS_INFO; } - final SuggestionsGatherer.Result result = - suggestionsGatherer.getResults(text, mService.mTypoThreshold); + final SuggestionsGatherer.Result result = suggestionsGatherer.getResults(text, + mService.mTypoThreshold, capitalizeType, mLocale); if (DBG) { Log.i(TAG, "Spell checking results for " + text + " with suggestion limit " |