aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/AndroidManifest.xml12
-rw-r--r--java/res/drawable-hdpi/ic_setup_wizard.pngbin0 -> 702 bytes
-rw-r--r--java/res/drawable-mdpi/ic_setup_wizard.pngbin0 -> 626 bytes
-rw-r--r--java/res/drawable-xhdpi/ic_setup_wizard.pngbin0 -> 737 bytes
-rw-r--r--java/res/drawable-xxhdpi/ic_setup_wizard.pngbin0 -> 892 bytes
-rw-r--r--java/res/values-af/strings.xml10
-rw-r--r--java/res/values-am/strings.xml10
-rw-r--r--java/res/values-ar/strings.xml10
-rw-r--r--java/res/values-be/strings.xml10
-rw-r--r--java/res/values-bg/strings.xml10
-rw-r--r--java/res/values-ca/strings.xml10
-rw-r--r--java/res/values-cs/strings.xml10
-rw-r--r--java/res/values-da/strings.xml10
-rw-r--r--java/res/values-de/strings.xml10
-rw-r--r--java/res/values-el/strings.xml10
-rw-r--r--java/res/values-en-rGB/strings.xml10
-rw-r--r--java/res/values-es-rUS/strings.xml26
-rw-r--r--java/res/values-es/strings.xml10
-rw-r--r--java/res/values-et/strings.xml10
-rw-r--r--java/res/values-fa/strings.xml10
-rw-r--r--java/res/values-fi/strings.xml10
-rw-r--r--java/res/values-fr/strings.xml10
-rw-r--r--java/res/values-hi/strings.xml10
-rw-r--r--java/res/values-hr/strings.xml26
-rw-r--r--java/res/values-hu/strings.xml10
-rw-r--r--java/res/values-in/strings.xml10
-rw-r--r--java/res/values-it/strings.xml10
-rw-r--r--java/res/values-iw/strings.xml10
-rw-r--r--java/res/values-ja/strings.xml10
-rw-r--r--java/res/values-ko/strings.xml10
-rw-r--r--java/res/values-lt/strings.xml10
-rw-r--r--java/res/values-lv/strings.xml10
-rw-r--r--java/res/values-ms/strings.xml10
-rw-r--r--java/res/values-nb/strings.xml10
-rw-r--r--java/res/values-nl/strings.xml26
-rw-r--r--java/res/values-pl/strings.xml10
-rw-r--r--java/res/values-pt-rPT/strings.xml10
-rw-r--r--java/res/values-pt/strings.xml10
-rw-r--r--java/res/values-rm/strings.xml20
-rw-r--r--java/res/values-ro/strings.xml10
-rw-r--r--java/res/values-ru/strings.xml10
-rw-r--r--java/res/values-sk/strings.xml10
-rw-r--r--java/res/values-sl/strings.xml10
-rw-r--r--java/res/values-sr/strings.xml26
-rw-r--r--java/res/values-sv/strings.xml26
-rw-r--r--java/res/values-sw/strings.xml14
-rw-r--r--java/res/values-th/strings.xml10
-rw-r--r--java/res/values-tl/strings.xml10
-rw-r--r--java/res/values-tr/strings.xml10
-rw-r--r--java/res/values-uk/strings.xml10
-rw-r--r--java/res/values-vi/strings.xml10
-rw-r--r--java/res/values-zh-rCN/strings.xml26
-rw-r--r--java/res/values-zh-rTW/strings.xml10
-rw-r--r--java/res/values-zu/strings.xml10
-rw-r--r--java/res/values/strings.xml21
-rw-r--r--java/src/com/android/inputmethod/compat/IntentCompatUtils.java36
-rw-r--r--java/src/com/android/inputmethod/keyboard/KeyboardView.java6
-rw-r--r--java/src/com/android/inputmethod/keyboard/MainKeyboardView.java2
-rw-r--r--java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java1
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java44
-rw-r--r--java/src/com/android/inputmethod/latin/setup/LauncherIconVisibilityManager.java125
-rw-r--r--java/src/com/android/inputmethod/latin/setup/SetupActivity.java55
-rw-r--r--java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java4
-rw-r--r--java/src/com/android/inputmethod/research/LogUnit.java1
-rw-r--r--java/src/com/android/inputmethod/research/ResearchLogger.java2
65 files changed, 262 insertions, 647 deletions
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index b88c18ee5..c05b318b9 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -24,6 +24,7 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_USER_DICTIONARY" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<application android:label="@string/aosp_android_keyboard_ime_name"
android:icon="@mipmap/ic_ime_settings"
@@ -50,12 +51,21 @@
<activity android:name=".setup.SetupActivity"
android:label="@string/aosp_android_keyboard_ime_name"
- android:icon="@mipmap/ic_ime_settings">
+ android:icon="@drawable/ic_setup_wizard">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+ <receiver android:name=".setup.LauncherIconVisibilityManager">
+ <intent-filter>
+ <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+ <action android:name="android.intent.action.BOOT_COMPLETED" />
+ <action android:name="android.intent.action.USER_INITIALIZE" />
+ </intent-filter>
+ </receiver>
+
<activity android:name="SettingsActivity" android:label="@string/english_ime_settings"
android:uiOptions="splitActionBarWhenNarrow">
<intent-filter>
diff --git a/java/res/drawable-hdpi/ic_setup_wizard.png b/java/res/drawable-hdpi/ic_setup_wizard.png
new file mode 100644
index 000000000..38fca6d9d
--- /dev/null
+++ b/java/res/drawable-hdpi/ic_setup_wizard.png
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_setup_wizard.png b/java/res/drawable-mdpi/ic_setup_wizard.png
new file mode 100644
index 000000000..66e62b820
--- /dev/null
+++ b/java/res/drawable-mdpi/ic_setup_wizard.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_setup_wizard.png b/java/res/drawable-xhdpi/ic_setup_wizard.png
new file mode 100644
index 000000000..53f70a617
--- /dev/null
+++ b/java/res/drawable-xhdpi/ic_setup_wizard.png
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_setup_wizard.png b/java/res/drawable-xxhdpi/ic_setup_wizard.png
new file mode 100644
index 000000000..6414b4f36
--- /dev/null
+++ b/java/res/drawable-xxhdpi/ic_setup_wizard.png
Binary files differ
diff --git a/java/res/values-af/strings.xml b/java/res/values-af/strings.xml
index 1cf46fe32..4daf46568 100644
--- a/java/res/values-af/strings.xml
+++ b/java/res/values-af/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Moet hierdie lêer regtig vir <xliff:g id="LOCALE_NAME">%s</xliff:g> geïnstalleer word?"</string>
<string name="error" msgid="8940763624668513648">"Daar was \'n fout"</string>
<string name="button_default" msgid="3988017840431881491">"Verstek"</string>
- <string name="setup_title" msgid="747642322299536064">"Installeer <xliff:g id="APPLICATION_NAME">%s</xliff:g> tans"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Aktiveer <xliff:g id="APPLICATION_NAME">%s</xliff:g> in instellings."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Vir sekuriteit, gaan asseblief \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" na"</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Skakel oor na <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Noudat jy <xliff:g id="APPLICATION_NAME">%s</xliff:g> geaktiveer het, kan jy oorskakel daarheen."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Veels geluk, jy\'s gereed!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Stel bykomende tale op"</string>
<string name="language_settings" msgid="1671153053201809031">"Taal en invoer"</string>
<string name="select_input_method" msgid="4301602374609275003">"Kies invoermetode"</string>
</resources>
diff --git a/java/res/values-am/strings.xml b/java/res/values-am/strings.xml
index 54a1f0b18..d1fe341b9 100644
--- a/java/res/values-am/strings.xml
+++ b/java/res/values-am/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"እውን ይሄ ፋይል ለ<xliff:g id="LOCALE_NAME">%s</xliff:g> ይጫን?"</string>
<string name="error" msgid="8940763624668513648">"ስህተት ተከስቶ ነበር"</string>
<string name="button_default" msgid="3988017840431881491">"ነባሪ"</string>
- <string name="setup_title" msgid="747642322299536064">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>ን በመጫን ላይ"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>ን በቅንብሮች ውስጥ ያንቁት።"</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"ለደህንነት ሲባል እባክዎ «<xliff:g id="APPLICATION_NAME">%s</xliff:g>» ላይ አመልካች ምልክት ያድርጉ"</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"ወደ <xliff:g id="APPLICATION_NAME">%s</xliff:g> ይቀይሩ።"</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"አሁን <xliff:g id="APPLICATION_NAME">%s</xliff:g>ን እንደማንቃትዎ መጠን ወደ እሱ ሊቀይሩ ይችላሉ።"</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"እንኳን ደስ አለዎት፣ በቃ ጨርሰዋል!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"ተጨማሪ ቋንቋዎችን ያዋቅሩ"</string>
<string name="language_settings" msgid="1671153053201809031">"ቋንቋ እና ግቤት"</string>
<string name="select_input_method" msgid="4301602374609275003">"የግቤት ስልት ይምረጡ"</string>
</resources>
diff --git a/java/res/values-ar/strings.xml b/java/res/values-ar/strings.xml
index 9bf682d2f..bca3c2aa3 100644
--- a/java/res/values-ar/strings.xml
+++ b/java/res/values-ar/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"هل تريد حقًا تثبيت هذا الملف للغة <xliff:g id="LOCALE_NAME">%s</xliff:g>؟"</string>
<string name="error" msgid="8940763624668513648">"حدث خطأ"</string>
<string name="button_default" msgid="3988017840431881491">"الافتراضية"</string>
- <string name="setup_title" msgid="747642322299536064">"تثبيت <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"تمكين <xliff:g id="APPLICATION_NAME">%s</xliff:g> من الإعدادات."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"لأغراض الأمان، يُرجى التحقق من \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"الانتقال إلى <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"الآن وبعد تمكين <xliff:g id="APPLICATION_NAME">%s</xliff:g>، يمكنك الانتقال إليه."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"تهانينا، بهذا تكون قد انتهيت من الإعداد"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"تهيئة اللغات الإضافية"</string>
<string name="language_settings" msgid="1671153053201809031">"اللغة والإدخال"</string>
<string name="select_input_method" msgid="4301602374609275003">"اختيار أسلوب الإدخال"</string>
</resources>
diff --git a/java/res/values-be/strings.xml b/java/res/values-be/strings.xml
index 385336d80..56382e42e 100644
--- a/java/res/values-be/strings.xml
+++ b/java/res/values-be/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Сапраўды ўсталяваць гэты файл на мове: <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Была памылка"</string>
<string name="button_default" msgid="3988017840431881491">"Па змаўчанні"</string>
- <string name="setup_title" msgid="747642322299536064">"Усталёўка \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Уключыць \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" у наладах."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"У мэтах бяспекi праверце прыкладанне \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Пераключыць на <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Зараз вы ўключылi \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" i можаце пераключыцца на яго."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Усё гатова!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Наладка дадатковых моў"</string>
<string name="language_settings" msgid="1671153053201809031">"Мова і ўвод"</string>
<string name="select_input_method" msgid="4301602374609275003">"Выберыце метад уводу"</string>
</resources>
diff --git a/java/res/values-bg/strings.xml b/java/res/values-bg/strings.xml
index 817dae107..3ffebea48 100644
--- a/java/res/values-bg/strings.xml
+++ b/java/res/values-bg/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Наистина ли да се инсталира този файл за <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Възникна грешка"</string>
<string name="button_default" msgid="3988017840431881491">"Стандартни"</string>
- <string name="setup_title" msgid="747642322299536064">"Инсталиране на <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Активирайте <xliff:g id="APPLICATION_NAME">%s</xliff:g> в настройките."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"От съображения за сигурност, моля, поставете отметка до <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Превключете към <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"След като вече активирахте приложението <xliff:g id="APPLICATION_NAME">%s</xliff:g>, можете да превключите към него."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Поздравления! Вече сте готови!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Конфигурирайте допълнителни езици."</string>
<string name="language_settings" msgid="1671153053201809031">"Език и въвеждане"</string>
<string name="select_input_method" msgid="4301602374609275003">"Избор на метод на въвеждане"</string>
</resources>
diff --git a/java/res/values-ca/strings.xml b/java/res/values-ca/strings.xml
index bf70148fc..26527381f 100644
--- a/java/res/values-ca/strings.xml
+++ b/java/res/values-ca/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Realment vols instal·lar aquest fitxer per a <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"S\'ha produït un error"</string>
<string name="button_default" msgid="3988017840431881491">"Predeterminat"</string>
- <string name="setup_title" msgid="747642322299536064">"Instal·lació de: <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Activa <xliff:g id="APPLICATION_NAME">%s</xliff:g> a la configuració."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Per motius de seguretat, comprova \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Canvia a <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Ara que ja has activat <xliff:g id="APPLICATION_NAME">%s</xliff:g>, pots canviar per accedir-hi."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Enhorabona, ja has acabat!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Configura idiomes addicionals"</string>
<string name="language_settings" msgid="1671153053201809031">"Idioma i introducció"</string>
<string name="select_input_method" msgid="4301602374609275003">"Selecció de mètodes d\'introducció"</string>
</resources>
diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml
index ac881980a..7e12f06d8 100644
--- a/java/res/values-cs/strings.xml
+++ b/java/res/values-cs/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Chcete nainstalovat tento soubor pro jazyk <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Došlo k chybě"</string>
<string name="button_default" msgid="3988017840431881491">"Výchozí"</string>
- <string name="setup_title" msgid="747642322299536064">"Instalace aplikace <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1."</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"V nastavení zapněte aplikaci <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Z bezpečnostních důvodů prosím aplikaci <xliff:g id="APPLICATION_NAME">%s</xliff:g> zkontrolujte."</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2."</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Přepněte na aplikaci <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Nyní jste zapnuli aplikaci <xliff:g id="APPLICATION_NAME">%s</xliff:g> a můžete na ni přepnout."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3."</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Gratulujeme, vše je připraveno."</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Nakonfigurujte další jazyky"</string>
<string name="language_settings" msgid="1671153053201809031">"Jazyk a zadávání"</string>
<string name="select_input_method" msgid="4301602374609275003">"Výběr metody zadávání dat"</string>
</resources>
diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml
index eba11d957..3ea4aaaef 100644
--- a/java/res/values-da/strings.xml
+++ b/java/res/values-da/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Er du klar til at installere denne fil til <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Der opstod en fejl"</string>
<string name="button_default" msgid="3988017840431881491">"Standard"</string>
- <string name="setup_title" msgid="747642322299536064">"Sådan installerer du <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Aktivér <xliff:g id="APPLICATION_NAME">%s</xliff:g> i indstillingerne."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Af sikkerhedsmæssige årsager skal du kontrollere \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Skift til <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Nu hvor du har aktiveret <xliff:g id="APPLICATION_NAME">%s</xliff:g>, kan du skifte til den."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Så er du klar."</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Konfigurer flere sprog"</string>
<string name="language_settings" msgid="1671153053201809031">"Sprog og input"</string>
<string name="select_input_method" msgid="4301602374609275003">"Vælg inputmetode"</string>
</resources>
diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml
index f9f4e7872..a50cdf0d0 100644
--- a/java/res/values-de/strings.xml
+++ b/java/res/values-de/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Möchten Sie diese Datei für <xliff:g id="LOCALE_NAME">%s</xliff:g> installieren?"</string>
<string name="error" msgid="8940763624668513648">"Es ist ein Fehler aufgetreten"</string>
<string name="button_default" msgid="3988017840431881491">"Standard"</string>
- <string name="setup_title" msgid="747642322299536064">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> wird installiert..."</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1."</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> in den Einstellungen aktivieren"</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Überprüfen Sie \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" aus Sicherheitsgründen."</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2."</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Zu <xliff:g id="APPLICATION_NAME">%s</xliff:g> wechseln"</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Nachdem Sie <xliff:g id="APPLICATION_NAME">%s</xliff:g> aktiviert haben, können Sie jetzt wechseln."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3."</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Die Einrichtung ist abgeschlossen"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Konfigurieren Sie weitere Sprachen."</string>
<string name="language_settings" msgid="1671153053201809031">"Sprache &amp; Eingabe"</string>
<string name="select_input_method" msgid="4301602374609275003">"Eingabemethode wählen"</string>
</resources>
diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml
index 16defa053..153dbbbf4 100644
--- a/java/res/values-el/strings.xml
+++ b/java/res/values-el/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Να εγκατασταθεί όντως αυτό το αρχείο για <xliff:g id="LOCALE_NAME">%s</xliff:g>;"</string>
<string name="error" msgid="8940763624668513648">"Παρουσιάστηκε σφάλμα."</string>
<string name="button_default" msgid="3988017840431881491">"Προεπιλογή"</string>
- <string name="setup_title" msgid="747642322299536064">"Εγκατάσταση της εφαρμογής <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Ενεργοποιήστε την εφαρμογή <xliff:g id="APPLICATION_NAME">%s</xliff:g> στις ρυθμίσεις."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Για λόγους ασφαλείας, επιλέξτε \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Μετάβαση στην εφαρμογή <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Αφού έχετε ενεργοποιήσει πλέον την εφαρμογή <xliff:g id="APPLICATION_NAME">%s</xliff:g>, μπορείτε να μεταβείτε σε αυτή."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Συγχαρητήρια, είστε έτοιμοι!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Διαμόρφωση πρόσθετων γλωσσών"</string>
<string name="language_settings" msgid="1671153053201809031">"Γλώσσα και εισαγωγή"</string>
<string name="select_input_method" msgid="4301602374609275003">"Επιλογή μεθόδου εισαγωγής"</string>
</resources>
diff --git a/java/res/values-en-rGB/strings.xml b/java/res/values-en-rGB/strings.xml
index 126d38fdf..5fbbdf667 100644
--- a/java/res/values-en-rGB/strings.xml
+++ b/java/res/values-en-rGB/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Really install this file for <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"There was an error"</string>
<string name="button_default" msgid="3988017840431881491">"Default"</string>
- <string name="setup_title" msgid="747642322299536064">"Installing <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Enable <xliff:g id="APPLICATION_NAME">%s</xliff:g> in settings."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"For security, please check \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Switch to <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Now that you\'ve enabled <xliff:g id="APPLICATION_NAME">%s</xliff:g>, you can switch to it."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Congratulations, you\'re all set!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Configure additional languages"</string>
<string name="language_settings" msgid="1671153053201809031">"Language &amp; input"</string>
<string name="select_input_method" msgid="4301602374609275003">"Choose input method"</string>
</resources>
diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml
index 3a41adf59..52ef956d8 100644
--- a/java/res/values-es-rUS/strings.xml
+++ b/java/res/values-es-rUS/strings.xml
@@ -157,28 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"¿Realmente quieres instalar este archivo para <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Se produjo un error."</string>
<string name="button_default" msgid="3988017840431881491">"Predeterminado"</string>
- <!-- no translation found for setup_title (747642322299536064) -->
- <skip />
- <!-- no translation found for setup_step1_bullet (1963433060317624853) -->
- <skip />
- <!-- no translation found for setup_step1_title (7316009176808245440) -->
- <skip />
- <!-- no translation found for setup_step1_instruction (600886471143563141) -->
- <skip />
- <!-- no translation found for setup_step2_bullet (1827848024009574912) -->
- <skip />
- <!-- no translation found for setup_step2_title (7272709575177957189) -->
- <skip />
- <!-- no translation found for setup_step2_instruction (954968636921544464) -->
- <skip />
- <!-- no translation found for setup_step3_bullet (1599279767555395777) -->
- <skip />
- <!-- no translation found for setup_step3_title (3154757183631490281) -->
- <skip />
- <!-- no translation found for setup_step3_instruction (3095456922436793809) -->
- <skip />
- <!-- no translation found for language_settings (1671153053201809031) -->
- <skip />
- <!-- no translation found for select_input_method (4301602374609275003) -->
- <skip />
+ <string name="language_settings" msgid="1671153053201809031">"Idioma &amp; entrada"</string>
+ <string name="select_input_method" msgid="4301602374609275003">"Seleccionar método de introducción"</string>
</resources>
diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml
index 8fc5ac327..9b31884a2 100644
--- a/java/res/values-es/strings.xml
+++ b/java/res/values-es/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"¿Seguro que quieres instalar este archivo para <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Se ha producido un error"</string>
<string name="button_default" msgid="3988017840431881491">"Predeterminado"</string>
- <string name="setup_title" msgid="747642322299536064">"Cómo instalar <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Habilita <xliff:g id="APPLICATION_NAME">%s</xliff:g> en los ajustes"</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Por seguridad, comprueba \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\"."</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Cambia a <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Ahora que has habilitado <xliff:g id="APPLICATION_NAME">%s</xliff:g>, puedes utilizar la aplicación."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"¡Enhorabuena, has terminado!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Configura otros idiomas"</string>
<string name="language_settings" msgid="1671153053201809031">"Idioma y entrada de texto"</string>
<string name="select_input_method" msgid="4301602374609275003">"Selecciona un método de entrada"</string>
</resources>
diff --git a/java/res/values-et/strings.xml b/java/res/values-et/strings.xml
index 9cffceb70..3364abe5e 100644
--- a/java/res/values-et/strings.xml
+++ b/java/res/values-et/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Kas soovite tõesti installida faili lokaadile <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Ilmnes viga"</string>
<string name="button_default" msgid="3988017840431881491">"Vaikeväärtus"</string>
- <string name="setup_title" msgid="747642322299536064">"Rakenduse <xliff:g id="APPLICATION_NAME">%s</xliff:g> installimine"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Lubage seadetes <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Turvakaalutlustel märkige „<xliff:g id="APPLICATION_NAME">%s</xliff:g>”"</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Minge üle rakendusele <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Kui olete rakenduse <xliff:g id="APPLICATION_NAME">%s</xliff:g> lubanud, saate hakata seda kasutama."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Õnnitleme. Kõik on valmis!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Seadistage lisakeeled"</string>
<string name="language_settings" msgid="1671153053201809031">"Keeled ja sisestamine"</string>
<string name="select_input_method" msgid="4301602374609275003">"Valige sisestusmeetod"</string>
</resources>
diff --git a/java/res/values-fa/strings.xml b/java/res/values-fa/strings.xml
index 9def2241c..54ba41256 100644
--- a/java/res/values-fa/strings.xml
+++ b/java/res/values-fa/strings.xml
@@ -161,16 +161,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"این فایل واقعاً برای <xliff:g id="LOCALE_NAME">%s</xliff:g> نصب شود؟"</string>
<string name="error" msgid="8940763624668513648">"خطایی روی داد"</string>
<string name="button_default" msgid="3988017840431881491">"پیش‌فرض"</string>
- <string name="setup_title" msgid="747642322299536064">"نصب <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"۱"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> را در تنظیمات فعال کنید."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"برای امنیت بیشتر، لطفاً «<xliff:g id="APPLICATION_NAME">%s</xliff:g>» را بررسی کنید"</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"۲"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"به <xliff:g id="APPLICATION_NAME">%s</xliff:g> بروید."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"اکنون که شما <xliff:g id="APPLICATION_NAME">%s</xliff:g> را فعال کرده‌اید، می‌توانید به آن بروید."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"۳"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"تبریک می‌گوییم، اکنون کاملاً آماده هستید!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"پیکربندی زبان‌های دیگر"</string>
<string name="language_settings" msgid="1671153053201809031">"زبان و ورودی"</string>
<string name="select_input_method" msgid="4301602374609275003">"انتخاب روش ورودی"</string>
</resources>
diff --git a/java/res/values-fi/strings.xml b/java/res/values-fi/strings.xml
index cbee04d2a..2d754023c 100644
--- a/java/res/values-fi/strings.xml
+++ b/java/res/values-fi/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Haluatko asentaa tämä tiedoston kielelle <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Tapahtui virhe"</string>
<string name="button_default" msgid="3988017840431881491">"Oletusarvot"</string>
- <string name="setup_title" msgid="747642322299536064">"Asennetaan <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Ota <xliff:g id="APPLICATION_NAME">%s</xliff:g> käyttöön asetuksissa."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Tarkista <xliff:g id="APPLICATION_NAME">%s</xliff:g> turvallisuussyistä"</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Siirry sovellukseen <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Nyt kun <xliff:g id="APPLICATION_NAME">%s</xliff:g> on otettu käyttöön, voit siirtyä sovellukseen."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Onneksi olkoon, valmista tuli!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Lisäkielien määritys"</string>
<string name="language_settings" msgid="1671153053201809031">"Kieli ja syöttötapa"</string>
<string name="select_input_method" msgid="4301602374609275003">"Valitse syöttötapa"</string>
</resources>
diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml
index 71ebfb1c9..f327f90f9 100644
--- a/java/res/values-fr/strings.xml
+++ b/java/res/values-fr/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Installer ce fichier pour la langue \"<xliff:g id="LOCALE_NAME">%s</xliff:g>\" ?"</string>
<string name="error" msgid="8940763624668513648">"Une erreur s\'est produite"</string>
<string name="button_default" msgid="3988017840431881491">"Par défaut"</string>
- <string name="setup_title" msgid="747642322299536064">"Installer <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Activer <xliff:g id="APPLICATION_NAME">%s</xliff:g> dans les paramètres"</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Pour votre sécurité, cochez la case \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\"."</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Lancer <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Maintenant que vous avez activé <xliff:g id="APPLICATION_NAME">%s</xliff:g>, lancez l\'application."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Félicitations, l\'opération est terminée"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Configurez les langues supplémentaires."</string>
<string name="language_settings" msgid="1671153053201809031">"Langue et saisie"</string>
<string name="select_input_method" msgid="4301602374609275003">"Sélectionnez le mode de saisie"</string>
</resources>
diff --git a/java/res/values-hi/strings.xml b/java/res/values-hi/strings.xml
index 2ad223383..e52143dc6 100644
--- a/java/res/values-hi/strings.xml
+++ b/java/res/values-hi/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"<xliff:g id="LOCALE_NAME">%s</xliff:g> के लिए वास्तव में यह फ़ाइल इंस्टॉल करें?"</string>
<string name="error" msgid="8940763624668513648">"कोई त्रुटि हुई थी"</string>
<string name="button_default" msgid="3988017840431881491">"डिफ़ॉल्ट"</string>
- <string name="setup_title" msgid="747642322299536064">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> इंस्टॉल करना"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"सेटिंग में <xliff:g id="APPLICATION_NAME">%s</xliff:g> को सक्षम करें."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"सुरक्षा के लिए, कृपया \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" को चेक करें"</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> पर स्विच करें."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"अब जबकि आपने <xliff:g id="APPLICATION_NAME">%s</xliff:g> को सक्षम कर दिया है, आप उस पर स्विच कर सकते हैं."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"बधाई हो, आप बिल्कुल तैयार हैं!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"अतिरिक्त भाषाएं कॉन्फ़िगर करना"</string>
<string name="language_settings" msgid="1671153053201809031">"भाषा और इनपुट"</string>
<string name="select_input_method" msgid="4301602374609275003">"इनपुट पद्धति चुनें"</string>
</resources>
diff --git a/java/res/values-hr/strings.xml b/java/res/values-hr/strings.xml
index a1e75fd97..564d48f14 100644
--- a/java/res/values-hr/strings.xml
+++ b/java/res/values-hr/strings.xml
@@ -157,28 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Želite li doista instalirati ovu datoteku za <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Došlo je do pogreške"</string>
<string name="button_default" msgid="3988017840431881491">"Zadano"</string>
- <!-- no translation found for setup_title (747642322299536064) -->
- <skip />
- <!-- no translation found for setup_step1_bullet (1963433060317624853) -->
- <skip />
- <!-- no translation found for setup_step1_title (7316009176808245440) -->
- <skip />
- <!-- no translation found for setup_step1_instruction (600886471143563141) -->
- <skip />
- <!-- no translation found for setup_step2_bullet (1827848024009574912) -->
- <skip />
- <!-- no translation found for setup_step2_title (7272709575177957189) -->
- <skip />
- <!-- no translation found for setup_step2_instruction (954968636921544464) -->
- <skip />
- <!-- no translation found for setup_step3_bullet (1599279767555395777) -->
- <skip />
- <!-- no translation found for setup_step3_title (3154757183631490281) -->
- <skip />
- <!-- no translation found for setup_step3_instruction (3095456922436793809) -->
- <skip />
- <!-- no translation found for language_settings (1671153053201809031) -->
- <skip />
- <!-- no translation found for select_input_method (4301602374609275003) -->
- <skip />
+ <string name="language_settings" msgid="1671153053201809031">"Jezik i unos"</string>
+ <string name="select_input_method" msgid="4301602374609275003">"Odabir načina unosa"</string>
</resources>
diff --git a/java/res/values-hu/strings.xml b/java/res/values-hu/strings.xml
index 7a7199f3d..047a31a6c 100644
--- a/java/res/values-hu/strings.xml
+++ b/java/res/values-hu/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Valóban telepíti ezt a fájlt <xliff:g id="LOCALE_NAME">%s</xliff:g> nyelvhez?"</string>
<string name="error" msgid="8940763624668513648">"Hiba történt."</string>
<string name="button_default" msgid="3988017840431881491">"Alapértelmezett"</string>
- <string name="setup_title" msgid="747642322299536064">"A(z) <xliff:g id="APPLICATION_NAME">%s</xliff:g> telepítése"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"A(z) <xliff:g id="APPLICATION_NAME">%s</xliff:g> alkalmazás engedélyezése a beállításokban."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Biztonsági okokból, kérjük, nézze meg a következőt: „<xliff:g id="APPLICATION_NAME">%s</xliff:g>”"</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Váltás a(z) <xliff:g id="APPLICATION_NAME">%s</xliff:g> alkalmazásra."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Most, hogy engedélyezte a(z) <xliff:g id="APPLICATION_NAME">%s</xliff:g> alkalmazást, átválthat rá."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Gratulálunk, máris elkészült!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Állítson be további nyelveket"</string>
<string name="language_settings" msgid="1671153053201809031">"Nyelv és bevitel"</string>
<string name="select_input_method" msgid="4301602374609275003">"Beviteli mód kiválasztása"</string>
</resources>
diff --git a/java/res/values-in/strings.xml b/java/res/values-in/strings.xml
index b3c79d6fe..ba9a7da4c 100644
--- a/java/res/values-in/strings.xml
+++ b/java/res/values-in/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Yakin ingin memasang file ini untuk <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Terjadi kesalahan"</string>
<string name="button_default" msgid="3988017840431881491">"Default"</string>
- <string name="setup_title" msgid="747642322299536064">"Memasang <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Aktifkan <xliff:g id="APPLICATION_NAME">%s</xliff:g> dalam setelan."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Untuk keamanan, periksa \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Beralih ke <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Kini setelah mengaktifkan <xliff:g id="APPLICATION_NAME">%s</xliff:g>, Anda dapat beralih ke aplikasi tersebut."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Selamat, Anda sudah siap!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Konfigurasikan bahasa tambahan"</string>
<string name="language_settings" msgid="1671153053201809031">"Bahasa &amp; masukan"</string>
<string name="select_input_method" msgid="4301602374609275003">"Pilih metode masukan"</string>
</resources>
diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml
index dc2f5bf6d..56acdf8ce 100644
--- a/java/res/values-it/strings.xml
+++ b/java/res/values-it/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Installare questo file per <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Si è verificato un errore"</string>
<string name="button_default" msgid="3988017840431881491">"Predefinito"</string>
- <string name="setup_title" msgid="747642322299536064">"Installazione di <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Attiva <xliff:g id="APPLICATION_NAME">%s</xliff:g> nelle impostazioni."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Per sicurezza, controlla \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\"."</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Passa a <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Ora che hai attivato <xliff:g id="APPLICATION_NAME">%s</xliff:g> puoi passare all\'app."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Congratulazioni, hai finito."</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Configura altre lingue."</string>
<string name="language_settings" msgid="1671153053201809031">"Lingua e input"</string>
<string name="select_input_method" msgid="4301602374609275003">"Scegli il metodo di immissione"</string>
</resources>
diff --git a/java/res/values-iw/strings.xml b/java/res/values-iw/strings.xml
index 6369d73fd..7c55ab569 100644
--- a/java/res/values-iw/strings.xml
+++ b/java/res/values-iw/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"האם באמת להתקין את הקובץ הזה עבור <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"אירעה שגיאה"</string>
<string name="button_default" msgid="3988017840431881491">"ברירת מחדל"</string>
- <string name="setup_title" msgid="747642322299536064">"מתקין את <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"הפעל את <xliff:g id="APPLICATION_NAME">%s</xliff:g> בהגדרות."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"מסיבות אבטחה, סמן את \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"עבור אל <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"עכשיו, לאחר שהפעלת את <xliff:g id="APPLICATION_NAME">%s</xliff:g>, תוכל לעבור אליו."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"ברכותינו, הכל מוכן!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"הגדר שפות נוספות"</string>
<string name="language_settings" msgid="1671153053201809031">"שפה וקלט"</string>
<string name="select_input_method" msgid="4301602374609275003">"בחירת שיטת קלט"</string>
</resources>
diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml
index 075b1c211..9328f0184 100644
--- a/java/res/values-ja/strings.xml
+++ b/java/res/values-ja/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"この<xliff:g id="LOCALE_NAME">%s</xliff:g>のファイルをインストールしてもよろしいですか?"</string>
<string name="error" msgid="8940763624668513648">"エラーが発生しました"</string>
<string name="button_default" msgid="3988017840431881491">"デフォルト"</string>
- <string name="setup_title" msgid="747642322299536064">"「<xliff:g id="APPLICATION_NAME">%s</xliff:g>」のインストール"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"設定での「<xliff:g id="APPLICATION_NAME">%s</xliff:g>」の有効化"</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"セキュリティ上の理由により、「<xliff:g id="APPLICATION_NAME">%s</xliff:g>」を確認してください"</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"「<xliff:g id="APPLICATION_NAME">%s</xliff:g>」への切り替え"</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"「<xliff:g id="APPLICATION_NAME">%s</xliff:g>」が有効になったので、そのアプリに切り替えることができます。"</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"設定完了"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"別の言語を設定してください"</string>
<string name="language_settings" msgid="1671153053201809031">"言語と入力"</string>
<string name="select_input_method" msgid="4301602374609275003">"入力方法の選択"</string>
</resources>
diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml
index 778f9278f..f6086eed5 100644
--- a/java/res/values-ko/strings.xml
+++ b/java/res/values-ko/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"이 파일을 <xliff:g id="LOCALE_NAME">%s</xliff:g>(으)로 설치하시겠습니까?"</string>
<string name="error" msgid="8940763624668513648">"오류 발생"</string>
<string name="button_default" msgid="3988017840431881491">"기본값"</string>
- <string name="setup_title" msgid="747642322299536064">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> 설치"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"설정에서 <xliff:g id="APPLICATION_NAME">%s</xliff:g> 사용 설정"</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"보안을 위해 \'<xliff:g id="APPLICATION_NAME">%s</xliff:g>\'을(를) 확인하세요."</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>(으)로 전환"</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"이제 <xliff:g id="APPLICATION_NAME">%s</xliff:g>이(가) 사용 설정되었으며 입력 방법을 전환할 수 있습니다."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"모든 설정이 완료되었습니다."</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"추가 언어 설정"</string>
<string name="language_settings" msgid="1671153053201809031">"언어 및 키보드"</string>
<string name="select_input_method" msgid="4301602374609275003">"입력 방법 선택"</string>
</resources>
diff --git a/java/res/values-lt/strings.xml b/java/res/values-lt/strings.xml
index 3f87f6c73..a815003b2 100644
--- a/java/res/values-lt/strings.xml
+++ b/java/res/values-lt/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Ar tikrai įdiegti šį failą <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Įvyko klaida"</string>
<string name="button_default" msgid="3988017840431881491">"Numatytieji"</string>
- <string name="setup_title" msgid="747642322299536064">"Diegiama „<xliff:g id="APPLICATION_NAME">%s</xliff:g>“"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Nustatymuose įgalinkite „<xliff:g id="APPLICATION_NAME">%s</xliff:g>“."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Saugos sumetimais patikrinkite „<xliff:g id="APPLICATION_NAME">%s</xliff:g>“"</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Perjungti į „<xliff:g id="APPLICATION_NAME">%s</xliff:g>“."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Kadangi įgalinote „<xliff:g id="APPLICATION_NAME">%s</xliff:g>“, galite ją perjungti."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Sveikiname, viską nustatėte!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Konfigūruokite papildomas kalbas"</string>
<string name="language_settings" msgid="1671153053201809031">"Kalba ir įvestis"</string>
<string name="select_input_method" msgid="4301602374609275003">"Pasirinkite įvesties metodą"</string>
</resources>
diff --git a/java/res/values-lv/strings.xml b/java/res/values-lv/strings.xml
index f24f2bdc7..6a408cfce 100644
--- a/java/res/values-lv/strings.xml
+++ b/java/res/values-lv/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Vai instalēt šo failu šādai valodai: <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Radās kļūda"</string>
<string name="button_default" msgid="3988017840431881491">"Noklusējums"</string>
- <string name="setup_title" msgid="747642322299536064">"Lietotnes <xliff:g id="APPLICATION_NAME">%s</xliff:g> instalēšana"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1."</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Lietotnes <xliff:g id="APPLICATION_NAME">%s</xliff:g> iespējošana iestatījumos."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Drošības nolūkos, lūdzu, atzīmējiet lietotni <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2."</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Pārslēgšanās uz lietotni <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Tagad lietotne <xliff:g id="APPLICATION_NAME">%s</xliff:g> ir iespējota un varat to pārslēgt."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3."</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Gatavs!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Konfigurējiet papildu valodas."</string>
<string name="language_settings" msgid="1671153053201809031">"Valoda un ievade"</string>
<string name="select_input_method" msgid="4301602374609275003">"Ievades metodes izvēle"</string>
</resources>
diff --git a/java/res/values-ms/strings.xml b/java/res/values-ms/strings.xml
index 0e9d77c0a..0d4ccf42d 100644
--- a/java/res/values-ms/strings.xml
+++ b/java/res/values-ms/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Betul-betul pasang fail ini untuk <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Berlaku ralat"</string>
<string name="button_default" msgid="3988017840431881491">"Lalai"</string>
- <string name="setup_title" msgid="747642322299536064">"Memasang <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Dayakan <xliff:g id="APPLICATION_NAME">%s</xliff:g> dalam tetapan."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Untuk keselamatan, sila tandakan \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Beralih ke <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Sekarang, sesudah anda mendayakan <xliff:g id="APPLICATION_NAME">%s</xliff:g>, anda boleh beralih padanya."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Tahniah, anda sudah sedia!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Konfigurasikan bahasa tambahan"</string>
<string name="language_settings" msgid="1671153053201809031">"Bahasa &amp; input"</string>
<string name="select_input_method" msgid="4301602374609275003">"Pilih kaedah input"</string>
</resources>
diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml
index 1498a1a11..f0b3a4623 100644
--- a/java/res/values-nb/strings.xml
+++ b/java/res/values-nb/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Vil du virkelig installere denne filen for <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Det oppsto en feil"</string>
<string name="button_default" msgid="3988017840431881491">"Standard"</string>
- <string name="setup_title" msgid="747642322299536064">"Installerer <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Aktiver <xliff:g id="APPLICATION_NAME">%s</xliff:g> i innstillingene."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"For sikkerhets skyld burde du sjekke «<xliff:g id="APPLICATION_NAME">%s</xliff:g>»"</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Bytt til <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Nå som du har aktivert <xliff:g id="APPLICATION_NAME">%s</xliff:g>, kan du bytte til appen."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Gratulerer, du er klar!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Konfigurer flere språk"</string>
<string name="language_settings" msgid="1671153053201809031">"Språk og inndata"</string>
<string name="select_input_method" msgid="4301602374609275003">"Velg inndatametode"</string>
</resources>
diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml
index 0d5b27ef1..dc3a9c3f4 100644
--- a/java/res/values-nl/strings.xml
+++ b/java/res/values-nl/strings.xml
@@ -157,28 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Wilt u dit bestand voor <xliff:g id="LOCALE_NAME">%s</xliff:g> echt installeren?"</string>
<string name="error" msgid="8940763624668513648">"Er is een fout opgetreden"</string>
<string name="button_default" msgid="3988017840431881491">"Standaard"</string>
- <!-- no translation found for setup_title (747642322299536064) -->
- <skip />
- <!-- no translation found for setup_step1_bullet (1963433060317624853) -->
- <skip />
- <!-- no translation found for setup_step1_title (7316009176808245440) -->
- <skip />
- <!-- no translation found for setup_step1_instruction (600886471143563141) -->
- <skip />
- <!-- no translation found for setup_step2_bullet (1827848024009574912) -->
- <skip />
- <!-- no translation found for setup_step2_title (7272709575177957189) -->
- <skip />
- <!-- no translation found for setup_step2_instruction (954968636921544464) -->
- <skip />
- <!-- no translation found for setup_step3_bullet (1599279767555395777) -->
- <skip />
- <!-- no translation found for setup_step3_title (3154757183631490281) -->
- <skip />
- <!-- no translation found for setup_step3_instruction (3095456922436793809) -->
- <skip />
- <!-- no translation found for language_settings (1671153053201809031) -->
- <skip />
- <!-- no translation found for select_input_method (4301602374609275003) -->
- <skip />
+ <string name="language_settings" msgid="1671153053201809031">"Taal en invoer"</string>
+ <string name="select_input_method" msgid="4301602374609275003">"Invoermethode selecteren"</string>
</resources>
diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml
index d281b1b93..de100bc86 100644
--- a/java/res/values-pl/strings.xml
+++ b/java/res/values-pl/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Czy na pewno zainstalować ten plik dla języka: <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Wystąpił błąd"</string>
<string name="button_default" msgid="3988017840431881491">"Domyślne"</string>
- <string name="setup_title" msgid="747642322299536064">"Instalowanie aplikacji <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1."</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Włącz <xliff:g id="APPLICATION_NAME">%s</xliff:g> w ustawieniach."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Dla bezpieczeństwa zaznacz „<xliff:g id="APPLICATION_NAME">%s</xliff:g>”"</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2."</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Przełącz się do <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Gdy aplikacja <xliff:g id="APPLICATION_NAME">%s</xliff:g> została włączona, możesz się do niej przełączyć."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3."</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Gratulacje! Wszystko gotowe."</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Skonfiguruj dodatkowe języki"</string>
<string name="language_settings" msgid="1671153053201809031">"Język, klawiatura, głos"</string>
<string name="select_input_method" msgid="4301602374609275003">"Wybierz metodę wprowadzania"</string>
</resources>
diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml
index cf24a7e06..68a34574f 100644
--- a/java/res/values-pt-rPT/strings.xml
+++ b/java/res/values-pt-rPT/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Instalar mesmo este ficheiro para <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Ocorreu um erro"</string>
<string name="button_default" msgid="3988017840431881491">"Predefinido"</string>
- <string name="setup_title" msgid="747642322299536064">"A instalar <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Ative <xliff:g id="APPLICATION_NAME">%s</xliff:g> nas definições."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Por uma questão de segurança, verifique \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Mudar para <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Agora que ativou <xliff:g id="APPLICATION_NAME">%s</xliff:g>, pode mudar para lá."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Parabéns, está pronto para começar!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Configurar idiomas adicionais"</string>
<string name="language_settings" msgid="1671153053201809031">"Idioma e entrada de som"</string>
<string name="select_input_method" msgid="4301602374609275003">"Escolher o método de entrada"</string>
</resources>
diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml
index e786df283..00ab88ced 100644
--- a/java/res/values-pt/strings.xml
+++ b/java/res/values-pt/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Deseja instalar este arquivo para <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Ocorreu um erro"</string>
<string name="button_default" msgid="3988017840431881491">"Padrão"</string>
- <string name="setup_title" msgid="747642322299536064">"Instalando o <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Ative o <xliff:g id="APPLICATION_NAME">%s</xliff:g> nas configurações."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Por motivos de segurança, marque \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Abra o <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Agora que ativou o <xliff:g id="APPLICATION_NAME">%s</xliff:g>, pode começar a usá-lo."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Parabéns, você terminou!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Configurar idiomas adicionais"</string>
<string name="language_settings" msgid="1671153053201809031">"Idioma e entrada"</string>
<string name="select_input_method" msgid="4301602374609275003">"Selecione o método de entrada"</string>
</resources>
diff --git a/java/res/values-rm/strings.xml b/java/res/values-rm/strings.xml
index 476fdb64b..9eec7f883 100644
--- a/java/res/values-rm/strings.xml
+++ b/java/res/values-rm/strings.xml
@@ -281,26 +281,6 @@
<skip />
<!-- no translation found for button_default (3988017840431881491) -->
<skip />
- <!-- no translation found for setup_title (747642322299536064) -->
- <skip />
- <!-- no translation found for setup_step1_bullet (1963433060317624853) -->
- <skip />
- <!-- no translation found for setup_step1_title (7316009176808245440) -->
- <skip />
- <!-- no translation found for setup_step1_instruction (600886471143563141) -->
- <skip />
- <!-- no translation found for setup_step2_bullet (1827848024009574912) -->
- <skip />
- <!-- no translation found for setup_step2_title (7272709575177957189) -->
- <skip />
- <!-- no translation found for setup_step2_instruction (954968636921544464) -->
- <skip />
- <!-- no translation found for setup_step3_bullet (1599279767555395777) -->
- <skip />
- <!-- no translation found for setup_step3_title (3154757183631490281) -->
- <skip />
- <!-- no translation found for setup_step3_instruction (3095456922436793809) -->
- <skip />
<!-- no translation found for language_settings (1671153053201809031) -->
<skip />
<!-- no translation found for select_input_method (4301602374609275003) -->
diff --git a/java/res/values-ro/strings.xml b/java/res/values-ro/strings.xml
index 189f3101f..c5a80e397 100644
--- a/java/res/values-ro/strings.xml
+++ b/java/res/values-ro/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Doriți să instalați acest fișier pentru <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"A apărut o eroare"</string>
<string name="button_default" msgid="3988017840431881491">"Prestabilit"</string>
- <string name="setup_title" msgid="747642322299536064">"Instalarea <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Activați <xliff:g id="APPLICATION_NAME">%s</xliff:g> din setări."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Pentru securitate, bifați „<xliff:g id="APPLICATION_NAME">%s</xliff:g>”"</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Comutați la <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Acum, după ce ați activat <xliff:g id="APPLICATION_NAME">%s</xliff:g>, puteți comuta la aceasta."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Felicitări, sunteți gata!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Configurați limbi suplimentare"</string>
<string name="language_settings" msgid="1671153053201809031">"Limbă și introducere de text"</string>
<string name="select_input_method" msgid="4301602374609275003">"Alegeți metoda de introducere de text"</string>
</resources>
diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml
index b6c46426a..13a567808 100644
--- a/java/res/values-ru/strings.xml
+++ b/java/res/values-ru/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Установить этот файл для следующего языка: <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Ошибка"</string>
<string name="button_default" msgid="3988017840431881491">"По умолчанию"</string>
- <string name="setup_title" msgid="747642322299536064">"Установка приложения \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1."</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Включите приложение \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\"."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Установите флажок напротив приложения \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" в настройках."</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2."</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Переключитесь на приложение \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\"."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Теперь, когда приложение \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" включено, вы можете перейти на него."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3."</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Настройте дополнительные языки."</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Готово!"</string>
<string name="language_settings" msgid="1671153053201809031">"Язык и ввод"</string>
<string name="select_input_method" msgid="4301602374609275003">"Выберите способ ввода"</string>
</resources>
diff --git a/java/res/values-sk/strings.xml b/java/res/values-sk/strings.xml
index a499dcaa4..0b28bf193 100644
--- a/java/res/values-sk/strings.xml
+++ b/java/res/values-sk/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Chcete nainštalovať tento súbor pre jazyk <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Vyskytla sa chyba"</string>
<string name="button_default" msgid="3988017840431881491">"Predvolené"</string>
- <string name="setup_title" msgid="747642322299536064">"Inštalácia aplikácie <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Povoľte v nastaveniach aplikáciu <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Skontrolujte z bezpečnostných dôvodov aplikáciu „<xliff:g id="APPLICATION_NAME">%s</xliff:g>“"</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Prepnite na aplikáciu <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Po povolení aplikácie <xliff:g id="APPLICATION_NAME">%s</xliff:g> môžete na túto aplikáciu prepnúť."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Blahoželáme, všetko je nastavené!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Nakonfigurujte ďalšie jazyky"</string>
<string name="language_settings" msgid="1671153053201809031">"Jazyk &amp; vstup"</string>
<string name="select_input_method" msgid="4301602374609275003">"Zvoliť metódu vstupu"</string>
</resources>
diff --git a/java/res/values-sl/strings.xml b/java/res/values-sl/strings.xml
index 6545061fc..50f3869d4 100644
--- a/java/res/values-sl/strings.xml
+++ b/java/res/values-sl/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Zares želite namestiti to datoteko za jezik <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Prišlo je do napake"</string>
<string name="button_default" msgid="3988017840431881491">"Privzeto"</string>
- <string name="setup_title" msgid="747642322299536064">"Nameščanje aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Omogočite aplikacijo <xliff:g id="APPLICATION_NAME">%s</xliff:g> v nastavitvah."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Zaradi varnosti preverite aplikacijo »<xliff:g id="APPLICATION_NAME">%s</xliff:g>«"</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Preklop na aplikacijo <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Ker je aplikacija <xliff:g id="APPLICATION_NAME">%s</xliff:g> omogočena, lahko preklopite nanjo."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Čestitamo, pripravljeni ste."</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Konfigurirajte dodatne jezike"</string>
<string name="language_settings" msgid="1671153053201809031">"Jezik in vnos"</string>
<string name="select_input_method" msgid="4301602374609275003">"Izbira načina vnosa"</string>
</resources>
diff --git a/java/res/values-sr/strings.xml b/java/res/values-sr/strings.xml
index baf69b6ce..2d13db099 100644
--- a/java/res/values-sr/strings.xml
+++ b/java/res/values-sr/strings.xml
@@ -157,28 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Желите ли стварно да инсталирате ову датотеку за <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Дошло је до грешке"</string>
<string name="button_default" msgid="3988017840431881491">"Подразумевано"</string>
- <!-- no translation found for setup_title (747642322299536064) -->
- <skip />
- <!-- no translation found for setup_step1_bullet (1963433060317624853) -->
- <skip />
- <!-- no translation found for setup_step1_title (7316009176808245440) -->
- <skip />
- <!-- no translation found for setup_step1_instruction (600886471143563141) -->
- <skip />
- <!-- no translation found for setup_step2_bullet (1827848024009574912) -->
- <skip />
- <!-- no translation found for setup_step2_title (7272709575177957189) -->
- <skip />
- <!-- no translation found for setup_step2_instruction (954968636921544464) -->
- <skip />
- <!-- no translation found for setup_step3_bullet (1599279767555395777) -->
- <skip />
- <!-- no translation found for setup_step3_title (3154757183631490281) -->
- <skip />
- <!-- no translation found for setup_step3_instruction (3095456922436793809) -->
- <skip />
- <!-- no translation found for language_settings (1671153053201809031) -->
- <skip />
- <!-- no translation found for select_input_method (4301602374609275003) -->
- <skip />
+ <string name="language_settings" msgid="1671153053201809031">"Језик и унос"</string>
+ <string name="select_input_method" msgid="4301602374609275003">"Избор метода уноса"</string>
</resources>
diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml
index 196eb3778..608caad17 100644
--- a/java/res/values-sv/strings.xml
+++ b/java/res/values-sv/strings.xml
@@ -157,28 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Vill du verkligen installera filen för <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Ett fel uppstod"</string>
<string name="button_default" msgid="3988017840431881491">"Standard"</string>
- <!-- no translation found for setup_title (747642322299536064) -->
- <skip />
- <!-- no translation found for setup_step1_bullet (1963433060317624853) -->
- <skip />
- <!-- no translation found for setup_step1_title (7316009176808245440) -->
- <skip />
- <!-- no translation found for setup_step1_instruction (600886471143563141) -->
- <skip />
- <!-- no translation found for setup_step2_bullet (1827848024009574912) -->
- <skip />
- <!-- no translation found for setup_step2_title (7272709575177957189) -->
- <skip />
- <!-- no translation found for setup_step2_instruction (954968636921544464) -->
- <skip />
- <!-- no translation found for setup_step3_bullet (1599279767555395777) -->
- <skip />
- <!-- no translation found for setup_step3_title (3154757183631490281) -->
- <skip />
- <!-- no translation found for setup_step3_instruction (3095456922436793809) -->
- <skip />
- <!-- no translation found for language_settings (1671153053201809031) -->
- <skip />
- <!-- no translation found for select_input_method (4301602374609275003) -->
- <skip />
+ <string name="language_settings" msgid="1671153053201809031">"Språk &amp; inmatning"</string>
+ <string name="select_input_method" msgid="4301602374609275003">"Välj inmatningsmetod"</string>
</resources>
diff --git a/java/res/values-sw/strings.xml b/java/res/values-sw/strings.xml
index 51958fdb9..104a5d42e 100644
--- a/java/res/values-sw/strings.xml
+++ b/java/res/values-sw/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Isakinishe faili hii kwa <xliff:g id="LOCALE_NAME">%s</xliff:g> kweli?"</string>
<string name="error" msgid="8940763624668513648">"Kulikuwa na hitilafu"</string>
<string name="button_default" msgid="3988017840431881491">"Chaguo-msingi"</string>
- <string name="setup_title" msgid="747642322299536064">"Inasakinisha <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Washa <xliff:g id="APPLICATION_NAME">%s</xliff:g> katika mipangilio."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Kwa usalama, tafadhali angalia \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Badili kwa <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Kwa kuwa sasa umewasha <xliff:g id="APPLICATION_NAME">%s</xliff:g>, unaweza kubadili."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Hongera, uko tayari!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Sanidi lugha za ziada"</string>
- <string name="language_settings" msgid="1671153053201809031">"Uingizaji lugha"</string>
- <string name="select_input_method" msgid="4301602374609275003">"Chagua njia ya ingizo"</string>
+ <string name="language_settings" msgid="1671153053201809031">"Lugha na uingizaji"</string>
+ <string name="select_input_method" msgid="4301602374609275003">"Chagua mbinu ya kuingiza data"</string>
</resources>
diff --git a/java/res/values-th/strings.xml b/java/res/values-th/strings.xml
index 3e4d1f044..1db5e91cd 100644
--- a/java/res/values-th/strings.xml
+++ b/java/res/values-th/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"ติดตั้งไฟล์นี้สำหรับ <xliff:g id="LOCALE_NAME">%s</xliff:g> จริงๆ หรือ"</string>
<string name="error" msgid="8940763624668513648">"เกิดข้อผิดพลาด"</string>
<string name="button_default" msgid="3988017840431881491">"ค่าเริ่มต้น"</string>
- <string name="setup_title" msgid="747642322299536064">"กำลังติดตั้ง <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"เปิดใช้งาน <xliff:g id="APPLICATION_NAME">%s</xliff:g> ในการตั้งค่า"</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"เพื่อความปลอดภัย โปรดตรวจสอบ \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"สลับไปใช้ <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"เมื่อคุณเปิดใช้งาน <xliff:g id="APPLICATION_NAME">%s</xliff:g> แล้ว คุณสามารถสลับไปใช้งานแอปดังกล่าวได้"</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"ยินดีด้วย คุณพร้อมใช้งานแล้ว!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"กำหนดค่าภาษาเพิ่มเติม"</string>
<string name="language_settings" msgid="1671153053201809031">"ภาษาและการป้อนข้อมูล"</string>
<string name="select_input_method" msgid="4301602374609275003">"เลือกวิธีการป้อนข้อมูล"</string>
</resources>
diff --git a/java/res/values-tl/strings.xml b/java/res/values-tl/strings.xml
index 1e600a0b1..adf0a1982 100644
--- a/java/res/values-tl/strings.xml
+++ b/java/res/values-tl/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"I-install talaga ang file na ito para sa <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Nagkaroon ng error"</string>
<string name="button_default" msgid="3988017840431881491">"Default"</string>
- <string name="setup_title" msgid="747642322299536064">"Pag-install ng <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Paganahin ang <xliff:g id="APPLICATION_NAME">%s</xliff:g> sa mga setting."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Para sa seguridad, pakilagyan ng check ang \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Lumipat sa <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Ngayong pinagana mo na ang <xliff:g id="APPLICATION_NAME">%s</xliff:g>, maaari ka nang lumipat dito."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Binabati kita, handa ka na!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Mag-configure ng mga karagdagang wika"</string>
<string name="language_settings" msgid="1671153053201809031">"Wika at input"</string>
<string name="select_input_method" msgid="4301602374609275003">"Pumili ng pamamaraan ng pag-input"</string>
</resources>
diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml
index b8747c2c6..fd80fea5b 100644
--- a/java/res/values-tr/strings.xml
+++ b/java/res/values-tr/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"<xliff:g id="LOCALE_NAME">%s</xliff:g> için bu dosya gerçekten yüklensin mi?"</string>
<string name="error" msgid="8940763624668513648">"Bir hata oluştu"</string>
<string name="button_default" msgid="3988017840431881491">"Varsayılan"</string>
- <string name="setup_title" msgid="747642322299536064">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> yükleniyor"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Ayarlarda <xliff:g id="APPLICATION_NAME">%s</xliff:g> uygulamasını etkinleştirin."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Güvenlik için lütfen \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" uygulamasını kontrol edin"</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> uygulamasına geçin."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> uygulamasını artık etkinleştirdiğinize göre, bu uygulamaya geçebilirsiniz."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Tebrikler, bitirdiniz!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Ek dilleri yapılandırın"</string>
<string name="language_settings" msgid="1671153053201809031">"Dil ve giriş"</string>
<string name="select_input_method" msgid="4301602374609275003">"Giriş yöntemini seçin"</string>
</resources>
diff --git a/java/res/values-uk/strings.xml b/java/res/values-uk/strings.xml
index 4e1ea70fa..2e2fdfcff 100644
--- a/java/res/values-uk/strings.xml
+++ b/java/res/values-uk/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Справді встановити цей файл для такої мови: <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Сталася помилка"</string>
<string name="button_default" msgid="3988017840431881491">"За умовчанням"</string>
- <string name="setup_title" msgid="747642322299536064">"Встановлення <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Увімкніть <xliff:g id="APPLICATION_NAME">%s</xliff:g> у налаштуваннях."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"З міркувань безпеки поставте прапорець біля \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Перейдіть до <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Тепер, коли програму <xliff:g id="APPLICATION_NAME">%s</xliff:g> увімкнено, ви можете перейти до неї."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Вітаємо! Налаштування завершено."</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Налаштуйте додаткові мови"</string>
<string name="language_settings" msgid="1671153053201809031">"Мова та введення"</string>
<string name="select_input_method" msgid="4301602374609275003">"Вибрати метод введення"</string>
</resources>
diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml
index 6d8e00fa4..6721980cf 100644
--- a/java/res/values-vi/strings.xml
+++ b/java/res/values-vi/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Thực sự cài đặt tệp này cho <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Đã xảy ra lỗi"</string>
<string name="button_default" msgid="3988017840431881491">"Mặc định"</string>
- <string name="setup_title" msgid="747642322299536064">"Cài đặt <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Bật <xliff:g id="APPLICATION_NAME">%s</xliff:g> trong cài đặt."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Để bảo mật, vui lòng chọn \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Chuyển sang <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Giờ khi bạn đã bật <xliff:g id="APPLICATION_NAME">%s</xliff:g>, bạn có thể chuyển sang ứng dụng này."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Xin chúc mừng, bạn đã cài đặt xong!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Định cấu hình các ngôn ngữ khác"</string>
<string name="language_settings" msgid="1671153053201809031">"Ngôn ngữ và phương thức nhập"</string>
<string name="select_input_method" msgid="4301602374609275003">"Chọn phương thức nhập"</string>
</resources>
diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml
index b4d94977b..ebb6b9161 100644
--- a/java/res/values-zh-rCN/strings.xml
+++ b/java/res/values-zh-rCN/strings.xml
@@ -157,28 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"确定要为<xliff:g id="LOCALE_NAME">%s</xliff:g>安装此文件吗?"</string>
<string name="error" msgid="8940763624668513648">"出现错误"</string>
<string name="button_default" msgid="3988017840431881491">"默认"</string>
- <!-- no translation found for setup_title (747642322299536064) -->
- <skip />
- <!-- no translation found for setup_step1_bullet (1963433060317624853) -->
- <skip />
- <!-- no translation found for setup_step1_title (7316009176808245440) -->
- <skip />
- <!-- no translation found for setup_step1_instruction (600886471143563141) -->
- <skip />
- <!-- no translation found for setup_step2_bullet (1827848024009574912) -->
- <skip />
- <!-- no translation found for setup_step2_title (7272709575177957189) -->
- <skip />
- <!-- no translation found for setup_step2_instruction (954968636921544464) -->
- <skip />
- <!-- no translation found for setup_step3_bullet (1599279767555395777) -->
- <skip />
- <!-- no translation found for setup_step3_title (3154757183631490281) -->
- <skip />
- <!-- no translation found for setup_step3_instruction (3095456922436793809) -->
- <skip />
- <!-- no translation found for language_settings (1671153053201809031) -->
- <skip />
- <!-- no translation found for select_input_method (4301602374609275003) -->
- <skip />
+ <string name="language_settings" msgid="1671153053201809031">"语言和输入法"</string>
+ <string name="select_input_method" msgid="4301602374609275003">"选择输入法"</string>
</resources>
diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml
index bc9d65fb6..7d4ea72eb 100644
--- a/java/res/values-zh-rTW/strings.xml
+++ b/java/res/values-zh-rTW/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"準備為<xliff:g id="LOCALE_NAME">%s</xliff:g>版本安裝這個檔案嗎?"</string>
<string name="error" msgid="8940763624668513648">"發生錯誤"</string>
<string name="button_default" msgid="3988017840431881491">"預設"</string>
- <string name="setup_title" msgid="747642322299536064">"安裝 <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"在設定中啟用 <xliff:g id="APPLICATION_NAME">%s</xliff:g>。"</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"基於安全性考量,請檢查「<xliff:g id="APPLICATION_NAME">%s</xliff:g>」"</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"切換至 <xliff:g id="APPLICATION_NAME">%s</xliff:g>。"</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"啟用完成,您現在可以切換至 <xliff:g id="APPLICATION_NAME">%s</xliff:g>。"</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"恭喜,您已完成設定!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"設定其他語言"</string>
<string name="language_settings" msgid="1671153053201809031">"語言與輸入設定"</string>
<string name="select_input_method" msgid="4301602374609275003">"選擇輸入法"</string>
</resources>
diff --git a/java/res/values-zu/strings.xml b/java/res/values-zu/strings.xml
index 2d6953d12..29ed595b7 100644
--- a/java/res/values-zu/strings.xml
+++ b/java/res/values-zu/strings.xml
@@ -157,16 +157,6 @@
<string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Ufuna ukufakela i-<xliff:g id="LOCALE_NAME">%s</xliff:g> leli fayela ngokweqiniso?"</string>
<string name="error" msgid="8940763624668513648">"Kube nephutha"</string>
<string name="button_default" msgid="3988017840431881491">"Okuzenzakalelayo"</string>
- <string name="setup_title" msgid="747642322299536064">"Kufakwa i-<xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_bullet" msgid="1963433060317624853">"1"</string>
- <string name="setup_step1_title" msgid="7316009176808245440">"Nika amandla i-<xliff:g id="APPLICATION_NAME">%s</xliff:g> kuzilungiselelo."</string>
- <string name="setup_step1_instruction" msgid="600886471143563141">"Okokuphepha, sicela uhlole lapha \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
- <string name="setup_step2_bullet" msgid="1827848024009574912">"2"</string>
- <string name="setup_step2_title" msgid="7272709575177957189">"Shintshela ku-<xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
- <string name="setup_step2_instruction" msgid="954968636921544464">"Manje njengoba sowunike amandla i-<xliff:g id="APPLICATION_NAME">%s</xliff:g>, ungashintshela kuyo."</string>
- <string name="setup_step3_bullet" msgid="1599279767555395777">"3"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"Siyakuhalalisela, usumi ngomumo!"</string>
- <string name="setup_step3_instruction" msgid="3095456922436793809">"Lungiselela izilimi ezingeziwe"</string>
<string name="language_settings" msgid="1671153053201809031">"Ulimi nokokufakwayo"</string>
<string name="select_input_method" msgid="4301602374609275003">"Khetha indlela yokufaka"</string>
</resources>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index f7d34c8e3..2a47d7afa 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -409,26 +409,27 @@
<!-- 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>
+ <!-- TODO: Remove translatable="false" once wordings are finalized. -->
<!-- Title of the setup wizard. [CHAR LIMT=40] -->
- <string name="setup_title">"Installing <xliff:g id="application_name">%s</xliff:g>"</string>
+ <string name="setup_title" translatable="false">"Installing <xliff:g id="application_name">%s</xliff:g>"</string>
<!-- Ordinal number of the 1st step in the setup wizard. [CHAR LIMIT=5] -->
- <string name="setup_step1_bullet">1</string>
+ <string name="setup_step1_bullet" translatable="false">1</string>
<!-- Title of the 1st step in the setup wizard. [CHAR LIMIT=64] -->
- <string name="setup_step1_title">"Enable <xliff:g id="application_name">%s</xliff:g> in settings."</string>
+ <string name="setup_step1_title" translatable="false">"Enable <xliff:g id="application_name">%s</xliff:g> in settings."</string>
<!-- Detailed instruction of the 1st step in the setup wizard. [CHAR LIMIT=80] -->
- <string name="setup_step1_instruction">"For security, please check \"<xliff:g id="application_name">%s</xliff:g>\""</string>
+ <string name="setup_step1_instruction" translatable="false">"For security, please check \"<xliff:g id="application_name">%s</xliff:g>\""</string>
<!-- Ordinal number of the 2nd step in the setup wizard. [CHAR LIMIT=5] -->
- <string name="setup_step2_bullet">2</string>
+ <string name="setup_step2_bullet" translatable="false">2</string>
<!-- Title of the 2nd step in the setup wizard. [CHAR LIMIT=64] -->
- <string name="setup_step2_title">"Switch to <xliff:g id="application_name">%s</xliff:g>."</string>
+ <string name="setup_step2_title" translatable="false">"Switch to <xliff:g id="application_name">%s</xliff:g>."</string>
<!-- Detailed instruction of the 2nd step in the setup wizard. [CHAR LIMIT=80] -->
- <string name="setup_step2_instruction">"Now that you've enabled <xliff:g id="application_name">%s</xliff:g>, you can switch to it."</string>
+ <string name="setup_step2_instruction" translatable="false">"Now that you've enabled <xliff:g id="application_name">%s</xliff:g>, you can switch to it."</string>
<!-- Ordinal number of the 3rd step in the setup wizard. [CHAR LIMIT=5] -->
- <string name="setup_step3_bullet">3</string>
+ <string name="setup_step3_bullet" translatable="false">3</string>
<!-- Title of the 3rd step in the setup wizard. [CHAR LIMIT=64] -->
- <string name="setup_step3_title">"Congratulations, you're all set!"</string>
+ <string name="setup_step3_title" translatable="false">"Congratulations, you're all set!"</string>
<!-- Detailed instruction of the 3rd step in the setup wizard. [CHAR LIMIT=80] -->
- <string name="setup_step3_instruction">Configure additional languages</string>
+ <string name="setup_step3_instruction" translatable="false">Configure additional languages</string>
<!-- Title of the Language & input settings. This should be aligned with msgid="5292716747264442359" -->
<string name="language_settings">Language &amp; input</string>
<!-- Title of the Input method picker. This should be aligned with msgid="4653387336791222978" -->
diff --git a/java/src/com/android/inputmethod/compat/IntentCompatUtils.java b/java/src/com/android/inputmethod/compat/IntentCompatUtils.java
new file mode 100644
index 000000000..df2e22fe8
--- /dev/null
+++ b/java/src/com/android/inputmethod/compat/IntentCompatUtils.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.inputmethod.compat;
+
+import android.content.Intent;
+
+public final class IntentCompatUtils {
+ // Note that Intent.ACTION_USER_INITIALIZE have been introduced in API level 17
+ // (Build.VERSION_CODE.JELLY_BEAN_MR1).
+ public static final String ACTION_USER_INITIALIZE =
+ (String)CompatUtils.getFieldValue(null, null,
+ CompatUtils.getField(Intent.class, "ACTION_USER_INITIALIZE"));
+
+ private IntentCompatUtils() {
+ // This utility class is not publicly instantiable.
+ }
+
+ public static boolean has_ACTION_USER_INITIALIZE(final Intent intent) {
+ return ACTION_USER_INITIALIZE != null && intent != null
+ && ACTION_USER_INITIALIZE.equals(intent.getAction());
+ }
+}
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index 365c35b48..350dc69b2 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -635,15 +635,9 @@ public class KeyboardView extends View {
invalidate(x, y, x + key.mWidth, y + key.mHeight);
}
- // TODO: Remove this method.
- public void closing() {
- mInvalidateAllKeys = true;
- }
-
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
- closing();
freeOffscreenBuffer();
}
}
diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
index 4d10f0e69..bc27f8553 100644
--- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
@@ -1236,13 +1236,11 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
mDrawingHandler.cancelAllMessages();
}
- @Override
public void closing() {
dismissAllKeyPreviews();
cancelAllMessages();
onDismissMoreKeysPanel();
mMoreKeysKeyboardCache.clear();
- super.closing();
}
/**
diff --git a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java
index 9e75f8b8a..0d42ab2fe 100644
--- a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java
@@ -174,7 +174,6 @@ public class MoreKeysKeyboardView extends KeyboardView implements MoreKeysPanel
@Override
public boolean dismissMoreKeysPanel() {
- super.closing();
if (mController == null) return false;
return mController.onDismissMoreKeysPanel();
}
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 2050c7663..79a05ceae 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -132,6 +132,8 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
private View mKeyPreviewBackingView;
private View mSuggestionsContainer;
private SuggestionStripView mSuggestionStripView;
+ // Never null
+ private SuggestedWords mSuggestedWords = SuggestedWords.EMPTY;
@UsedForTesting Suggest mSuggest;
private CompletionInfo[] mApplicationSpecifiedCompletions;
private ApplicationInfo mTargetApplicationInfo;
@@ -731,6 +733,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
// otherwise it will clear the suggestion strip.
setPunctuationSuggestions();
}
+ mSuggestedWords = SuggestedWords.EMPTY;
mConnection.resetCachesUponCursorMove(editorInfo.initialSelStart);
@@ -995,7 +998,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
false /* isPrediction */);
// When in fullscreen mode, show completions generated by the application
final boolean isAutoCorrection = false;
- setSuggestionStrip(suggestedWords, isAutoCorrection);
+ setSuggestedWords(suggestedWords, isAutoCorrection);
setAutoCorrectionIndicator(isAutoCorrection);
setSuggestionStripShown(true);
if (ProductionFlag.IS_EXPERIMENTAL) {
@@ -1120,7 +1123,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
if (mSettings.getCurrent().mBigramPredictionEnabled) {
clearSuggestionStrip();
} else {
- setSuggestionStrip(mSettings.getCurrent().mSuggestPuncList, false);
+ setSuggestedWords(mSettings.getCurrent().mSuggestPuncList, false);
}
mConnection.resetCachesUponCursorMove(newCursorPosition);
}
@@ -1983,8 +1986,8 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
// Outside LatinIME, only used by the test suite.
@UsedForTesting
boolean isShowingPunctuationList() {
- if (mSuggestionStripView == null) return false;
- return mSettings.getCurrent().mSuggestPuncList == mSuggestionStripView.getSuggestions();
+ if (mSuggestedWords == null) return false;
+ return mSettings.getCurrent().mSuggestPuncList == mSuggestedWords;
}
private boolean isSuggestionsStripVisible() {
@@ -2000,11 +2003,12 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
}
private void clearSuggestionStrip() {
- setSuggestionStrip(SuggestedWords.EMPTY, false);
+ setSuggestedWords(SuggestedWords.EMPTY, false);
setAutoCorrectionIndicator(false);
}
- private void setSuggestionStrip(final SuggestedWords words, final boolean isAutoCorrection) {
+ private void setSuggestedWords(final SuggestedWords words, final boolean isAutoCorrection) {
+ mSuggestedWords = words;
if (mSuggestionStripView != null) {
mSuggestionStripView.setSuggestions(words);
mKeyboardSwitcher.onAutoCorrectionStateChanged(isAutoCorrection);
@@ -2087,15 +2091,16 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
}
private SuggestedWords getOlderSuggestions(final String typedWord) {
- SuggestedWords previousSuggestions = mSuggestionStripView.getSuggestions();
- if (previousSuggestions == mSettings.getCurrent().mSuggestPuncList) {
- previousSuggestions = SuggestedWords.EMPTY;
+ SuggestedWords previousSuggestedWords = mSuggestedWords;
+ if (previousSuggestedWords == mSettings.getCurrent().mSuggestPuncList) {
+ previousSuggestedWords = SuggestedWords.EMPTY;
}
if (typedWord == null) {
- return previousSuggestions;
+ return previousSuggestedWords;
}
final ArrayList<SuggestedWords.SuggestedWordInfo> typedWordAndPreviousSuggestions =
- SuggestedWords.getTypedWordAndPreviousSuggestions(typedWord, previousSuggestions);
+ SuggestedWords.getTypedWordAndPreviousSuggestions(typedWord,
+ previousSuggestedWords);
return new SuggestedWords(typedWordAndPreviousSuggestions,
false /* typedWordValid */,
false /* hasAutoCorrectionCandidate */,
@@ -2117,7 +2122,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
}
mWordComposer.setAutoCorrection(autoCorrection);
final boolean isAutoCorrection = suggestedWords.willAutoCorrect();
- setSuggestionStrip(suggestedWords, isAutoCorrection);
+ setSuggestedWords(suggestedWords, isAutoCorrection);
setAutoCorrectionIndicator(isAutoCorrection);
setSuggestionStripShown(isSuggestionsStripVisible());
}
@@ -2140,7 +2145,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
Stats.onAutoCorrection(typedWord, autoCorrection, separatorString, mWordComposer);
}
if (ProductionFlag.IS_EXPERIMENTAL) {
- final SuggestedWords suggestedWords = mSuggestionStripView.getSuggestions();
+ final SuggestedWords suggestedWords = mSuggestedWords;
ResearchLogger.latinIme_commitCurrentAutoCorrection(typedWord, autoCorrection,
separatorString, mWordComposer.isBatchMode(), suggestedWords);
}
@@ -2165,7 +2170,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
// interface
@Override
public void pickSuggestionManually(final int index, final String suggestion) {
- final SuggestedWords suggestedWords = mSuggestionStripView.getSuggestions();
+ final SuggestedWords suggestedWords = mSuggestedWords;
// If this is a punctuation picked from the suggestion strip, pass it to onCodeInput
if (suggestion.length() == 1 && isShowingPunctuationList()) {
// Word separators are suggested before the user inputs something.
@@ -2197,6 +2202,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
if (mSettings.getCurrent().isApplicationSpecifiedCompletionsOn()
&& mApplicationSpecifiedCompletions != null
&& index >= 0 && index < mApplicationSpecifiedCompletions.length) {
+ mSuggestedWords = SuggestedWords.EMPTY;
if (mSuggestionStripView != null) {
mSuggestionStripView.clear();
}
@@ -2252,7 +2258,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
*/
private void commitChosenWord(final String chosenWord, final int commitType,
final String separatorString) {
- final SuggestedWords suggestedWords = mSuggestionStripView.getSuggestions();
+ final SuggestedWords suggestedWords = mSuggestedWords;
mConnection.commitText(SuggestionSpanUtils.getTextWithSuggestionSpan(
this, chosenWord, suggestedWords, mIsMainDictionaryAvailable), 1);
// Add the word to the user history dictionary
@@ -2269,7 +2275,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
if (mSettings.getCurrent().mBigramPredictionEnabled) {
clearSuggestionStrip();
} else {
- setSuggestionStrip(mSettings.getCurrent().mSuggestPuncList, false);
+ setSuggestedWords(mSettings.getCurrent().mSuggestPuncList, false);
}
setAutoCorrectionIndicator(false);
setSuggestionStripShown(isSuggestionsStripVisible());
@@ -2566,6 +2572,12 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
dialog.show();
}
+ // TODO: can this be removed somehow without breaking the tests?
+ @UsedForTesting
+ /* package for test */ String getFirstSuggestedWord() {
+ return mSuggestedWords.size() > 0 ? mSuggestedWords.getWord(0) : null;
+ }
+
public void debugDumpStateAndCrashWithException(final String context) {
final StringBuilder s = new StringBuilder();
s.append("Target application : ").append(mTargetApplicationInfo.name)
diff --git a/java/src/com/android/inputmethod/latin/setup/LauncherIconVisibilityManager.java b/java/src/com/android/inputmethod/latin/setup/LauncherIconVisibilityManager.java
new file mode 100644
index 000000000..ad34011ea
--- /dev/null
+++ b/java/src/com/android/inputmethod/latin/setup/LauncherIconVisibilityManager.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.inputmethod.latin.setup;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Process;
+import android.util.Log;
+
+import com.android.inputmethod.compat.IntentCompatUtils;
+import com.android.inputmethod.latin.RichInputMethodManager;
+
+/**
+ * This class detects the {@link Intent#ACTION_MY_PACKAGE_REPLACED} broadcast intent when this IME
+ * package has been replaced by a newer version of the same package. This class also detects
+ * {@link Intent#ACTION_BOOT_COMPLETED} and {@link Intent#ACTION_USER_INITIALIZE} broadcast intent.
+ *
+ * If this IME has already been installed in the system image and a new version of this IME has
+ * been installed, {@link Intent#ACTION_MY_PACKAGE_REPLACED} is received by this receiver and it
+ * will hide the setup wizard's icon.
+ *
+ * If this IME has already been installed in the data partition and a new version of this IME has
+ * been installed, {@link Intent#ACTION_MY_PACKAGE_REPLACED} is received by this receiver but it
+ * will not hide the setup wizard's icon, and the icon will appear on the launcher.
+ *
+ * If this IME hasn't been installed yet and has been newly installed, no
+ * {@link Intent#ACTION_MY_PACKAGE_REPLACED} will be sent and the setup wizard's icon will appear
+ * on the launcher.
+ *
+ * When the device has been booted, {@link Intent#ACTION_BOOT_COMPLETED} is received by this
+ * receiver and it checks whether the setup wizard's icon should be appeared or not on the launcher
+ * depending on which partition this IME is installed.
+ *
+ * When a multiuser account has been created, {@link Intent#ACTION_USER_INITIALIZE} is received
+ * by this receiver and it checks the whether the setup wizard's icon should be appeared or not on
+ * the launcher depending on which partition this IME is installed.
+ */
+public final class LauncherIconVisibilityManager extends BroadcastReceiver {
+ private static final String TAG = LauncherIconVisibilityManager.class.getSimpleName();
+
+ @Override
+ public void onReceive(final Context context, final Intent intent) {
+ if (shouldHandleThisIntent(intent, context)) {
+ if (isInSystemImage(context)) {
+ disableActivity(context, SetupActivity.class);
+ } else {
+ Log.i(TAG, "This package isn't in system image: " + context.getPackageName());
+ }
+ }
+
+ // The process that hosts this broadcast receiver is invoked and remains alive even after
+ // 1) the package has been re-installed, 2) the device has been booted,
+ // 3) a multiuser has been created.
+ // There is no good reason to keep the process alive if this IME isn't a current IME.
+ RichInputMethodManager.init(context);
+ if (!SetupActivity.isThisImeCurrent(context)) {
+ final int myPid = Process.myPid();
+ Log.i(TAG, "Killing my process: pid=" + myPid);
+ Process.killProcess(myPid);
+ }
+ }
+
+ private static boolean shouldHandleThisIntent(final Intent intent, final Context context) {
+ final String action = intent.getAction();
+ if (Intent.ACTION_MY_PACKAGE_REPLACED.equals(action)) {
+ Log.i(TAG, "Package has been replaced: " + context.getPackageName());
+ return true;
+ } else if (Intent.ACTION_BOOT_COMPLETED.equals(action)) {
+ Log.i(TAG, "Boot has been completed");
+ return true;
+ } else if (IntentCompatUtils.has_ACTION_USER_INITIALIZE(intent)) {
+ Log.i(TAG, "User initialize");
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Disable an activity of the specified package. Disabling an activity will also hide its
+ * icon from the launcher.
+ *
+ * @param context package context of an activity to be disabled
+ * @param activityClass activity class to be disabled
+ */
+ private static void disableActivity(final Context context,
+ final Class<? extends Activity> activityClass) {
+ final ComponentName activityComponent = new ComponentName(context, activityClass);
+ final PackageManager pm = context.getPackageManager();
+ final int activityComponentState = pm.getComponentEnabledSetting(activityComponent);
+ if (activityComponentState == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
+ // This activity is already disabled.
+ Log.i(TAG, "Activity has already been disabled: " + activityComponent);
+ return;
+ }
+ // Disabling an activity will also hide its icon from the launcher.
+ pm.setComponentEnabledSetting(activityComponent,
+ PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+ PackageManager.DONT_KILL_APP);
+ Log.i(TAG, "Disable activity: " + activityComponent);
+ }
+
+ private static boolean isInSystemImage(final Context context) {
+ final ApplicationInfo appInfo = context.getApplicationInfo();
+ return (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
+ }
+}
diff --git a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
index c30ecfb16..e009fbc39 100644
--- a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
+++ b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
@@ -17,6 +17,7 @@
package com.android.inputmethod.latin.setup;
import android.app.Activity;
+import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import android.graphics.PorterDuff;
@@ -43,7 +44,7 @@ public final class SetupActivity extends Activity {
private SetupStepIndicatorView mStepIndicatorView;
private final SetupStepGroup mSetupSteps = new SetupStepGroup();
private static final String STATE_STEP = "step";
- private int mStepNo;
+ private int mStepNumber;
private static final int STEP_1 = 1;
private static final int STEP_2 = 2;
private static final int STEP_3 = 3;
@@ -63,7 +64,7 @@ public final class SetupActivity extends Activity {
final SetupActivity setupActivity = getOuterInstance();
switch (msg.what) {
case MSG_POLLING_IME_SETTINGS:
- if (setupActivity.isMyImeEnabled()) {
+ if (SetupActivity.isThisImeEnabled(setupActivity)) {
setupActivity.invokeSetupWizardOfThisIme();
return;
}
@@ -92,12 +93,12 @@ public final class SetupActivity extends Activity {
RichInputMethodManager.init(this);
if (savedInstanceState == null) {
- mStepNo = determineSetupStepNo();
+ mStepNumber = determineSetupStepNumber();
} else {
- mStepNo = savedInstanceState.getInt(STATE_STEP);
+ mStepNumber = savedInstanceState.getInt(STATE_STEP);
}
- if (mStepNo == STEP_3) {
+ if (mStepNumber == STEP_3) {
// This IME already has been enabled and set as current IME.
// TODO: Implement tutorial.
invokeSettingsOfThisIme();
@@ -182,8 +183,16 @@ public final class SetupActivity extends Activity {
startActivity(intent);
}
- private boolean isMyImeEnabled() {
- final String packageName = getPackageName();
+ /**
+ * Check if the IME specified by the context is enabled.
+ * Note that {@link RichInputMethodManager} must have been initialized before calling this
+ * method.
+ *
+ * @param context package context of the IME to be checked.
+ * @return true if this IME is enabled.
+ */
+ public static boolean isThisImeEnabled(final Context context) {
+ final String packageName = context.getPackageName();
final InputMethodManager imm = RichInputMethodManager.getInstance().getInputMethodManager();
for (final InputMethodInfo imi : imm.getEnabledInputMethodList()) {
if (packageName.equals(imi.getPackageName())) {
@@ -193,20 +202,28 @@ public final class SetupActivity extends Activity {
return false;
}
- private boolean isMyImeCurrent() {
+ /**
+ * Check if the IME specified by the context is the current IME.
+ * Note that {@link RichInputMethodManager} must have been initialized before calling this
+ * method.
+ *
+ * @param context package context of the IME to be checked.
+ * @return true if this IME is the current IME.
+ */
+ public static boolean isThisImeCurrent(final Context context) {
final InputMethodInfo myImi =
RichInputMethodManager.getInstance().getInputMethodInfoOfThisIme();
final String currentImeId = Settings.Secure.getString(
- getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
+ context.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
return myImi.getId().equals(currentImeId);
}
- private int determineSetupStepNo() {
+ private int determineSetupStepNumber() {
mHandler.cancelPollingImeSettings();
- if (!isMyImeEnabled()) {
+ if (!isThisImeEnabled(this)) {
return STEP_1;
}
- if (!isMyImeCurrent()) {
+ if (!isThisImeCurrent(this)) {
return STEP_2;
}
return STEP_3;
@@ -215,25 +232,25 @@ public final class SetupActivity extends Activity {
@Override
protected void onSaveInstanceState(final Bundle outState) {
super.onSaveInstanceState(outState);
- outState.putInt(STATE_STEP, mStepNo);
+ outState.putInt(STATE_STEP, mStepNumber);
}
@Override
protected void onRestoreInstanceState(final Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
- mStepNo = savedInstanceState.getInt(STATE_STEP);
+ mStepNumber = savedInstanceState.getInt(STATE_STEP);
}
@Override
protected void onStart() {
super.onStart();
- mStepNo = determineSetupStepNo();
+ mStepNumber = determineSetupStepNumber();
}
@Override
protected void onRestart() {
super.onRestart();
- mStepNo = determineSetupStepNo();
+ mStepNumber = determineSetupStepNumber();
}
@Override
@@ -248,15 +265,15 @@ public final class SetupActivity extends Activity {
if (!hasFocus) {
return;
}
- mStepNo = determineSetupStepNo();
+ mStepNumber = determineSetupStepNumber();
updateSetupStepView();
}
private void updateSetupStepView() {
final int layoutDirection = ViewCompatUtils.getLayoutDirection(mStepIndicatorView);
mStepIndicatorView.setIndicatorPosition(
- getIndicatorPosition(mStepNo, mSetupSteps.getTotalStep(), layoutDirection));
- mSetupSteps.enableStep(mStepNo);
+ getIndicatorPosition(mStepNumber, mSetupSteps.getTotalStep(), layoutDirection));
+ mSetupSteps.enableStep(mStepNumber);
}
private static float getIndicatorPosition(final int step, final int totalStep,
diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
index bc51d5d62..5a29eee4e 100644
--- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
+++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
@@ -644,10 +644,6 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
return false;
}
- public SuggestedWords getSuggestions() {
- return mSuggestedWords;
- }
-
public void clear() {
mSuggestionsStrip.removeAllViews();
removeAllViews();
diff --git a/java/src/com/android/inputmethod/research/LogUnit.java b/java/src/com/android/inputmethod/research/LogUnit.java
index c1258f496..839e2b7ba 100644
--- a/java/src/com/android/inputmethod/research/LogUnit.java
+++ b/java/src/com/android/inputmethod/research/LogUnit.java
@@ -16,7 +16,6 @@
package com.android.inputmethod.research;
-import android.content.SharedPreferences;
import android.os.SystemClock;
import android.text.TextUtils;
import android.util.JsonWriter;
diff --git a/java/src/com/android/inputmethod/research/ResearchLogger.java b/java/src/com/android/inputmethod/research/ResearchLogger.java
index 0367a15a2..80e4af28f 100644
--- a/java/src/com/android/inputmethod/research/ResearchLogger.java
+++ b/java/src/com/android/inputmethod/research/ResearchLogger.java
@@ -206,7 +206,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
private Intent mUploadIntent;
private Intent mUploadNowIntent;
- private LogUnit mCurrentLogUnit = new LogUnit();
+ /* package for test */ LogUnit mCurrentLogUnit = new LogUnit();
// Gestured or tapped words may be committed after the gesture of the next word has started.
// To ensure that the gesture data of the next word is not associated with the previous word,