diff options
Diffstat (limited to 'java')
136 files changed, 1092 insertions, 782 deletions
diff --git a/java/res/layout/key_preview_ics.xml b/java/res/layout/key_preview.xml index 33b6947ef..16d4c72c3 100644 --- a/java/res/layout/key_preview_ics.xml +++ b/java/res/layout/key_preview.xml @@ -21,7 +21,7 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/keyboard_key_feedback_ics" android:minWidth="32dp" android:gravity="center" + style="?attr/keyPreviewTextViewStyle" /> diff --git a/java/res/layout/key_preview_gb.xml b/java/res/layout/key_preview_gb.xml deleted file mode 100644 index 2f2a321a3..000000000 --- a/java/res/layout/key_preview_gb.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, 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. -*/ ---> - -<TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/keyboard_key_feedback_gb" - android:minWidth="32dp" - android:gravity="center" -/> diff --git a/java/res/layout/more_keys_keyboard.xml b/java/res/layout/more_keys_keyboard.xml index 6637117e0..f3795afdc 100644 --- a/java/res/layout/more_keys_keyboard.xml +++ b/java/res/layout/more_keys_keyboard.xml @@ -22,11 +22,9 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" - style="?attr/moreKeysKeyboardContainerStyle" + android:orientation="vertical" > <com.android.inputmethod.keyboard.MoreKeysKeyboardView - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" android:id="@+id/more_keys_keyboard_view" android:layout_width="wrap_content" android:layout_height="wrap_content" /> diff --git a/java/res/layout/more_suggestions.xml b/java/res/layout/more_suggestions.xml index 8659f0761..264325890 100644 --- a/java/res/layout/more_suggestions.xml +++ b/java/res/layout/more_suggestions.xml @@ -22,8 +22,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" - style="?attr/moreKeysKeyboardContainerStyle" + android:orientation="vertical" > <com.android.inputmethod.latin.suggestions.MoreSuggestionsView xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" diff --git a/java/res/values-af/strings-action-keys.xml b/java/res/values-af/strings-action-keys.xml index 615dc1205..c5cd71ab7 100644 --- a/java/res/values-af/strings-action-keys.xml +++ b/java/res/values-af/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Gaan"</string> - <string name="label_next_key" msgid="362972844525672568">"Volgende"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Vorige"</string> - <string name="label_done_key" msgid="2441578748772529288">"Klaar"</string> - <string name="label_send_key" msgid="2815056534433717444">"Stuur"</string> - <string name="label_pause_key" msgid="181098308428035340">"Laat wag"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Wag"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Gaan"</string> + <string name="label_next_key" msgid="5586407279258592635">"Volg."</string> + <string name="label_previous_key" msgid="1421141755779895275">"Vorige"</string> + <string name="label_done_key" msgid="7564866296502630852">"Klaar"</string> + <string name="label_send_key" msgid="482252074224462163">"Stuur"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Laat wag"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Wag"</string> </resources> diff --git a/java/res/values-af/strings.xml b/java/res/values-af/strings.xml index a4ae86b41..045e97d94 100644 --- a/java/res/values-af/strings.xml +++ b/java/res/values-af/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alfabet (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alfabet (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emosiekone"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Kleurskema"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Wit"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Blou"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Gepasmaakte invoerstyle"</string> <string name="add_style" msgid="6163126614514489951">"Voeg styl by"</string> <string name="add" msgid="8299699805688017798">"Voeg by"</string> diff --git a/java/res/values-am/strings-action-keys.xml b/java/res/values-am/strings-action-keys.xml index 45196a4b4..1813a86d8 100644 --- a/java/res/values-am/strings-action-keys.xml +++ b/java/res/values-am/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"ሂድ"</string> - <string name="label_next_key" msgid="362972844525672568">"በመቀጠል"</string> - <string name="label_previous_key" msgid="1211868118071386787">"ቀዳሚ"</string> - <string name="label_done_key" msgid="2441578748772529288">"ተከናውኗል"</string> - <string name="label_send_key" msgid="2815056534433717444">" ይላኩ"</string> - <string name="label_pause_key" msgid="181098308428035340">"ላፍታ አቁም"</string> - <string name="label_wait_key" msgid="6402152600878093134">"ቆይ"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"ሂድ"</string> + <string name="label_next_key" msgid="5586407279258592635">"ቀጣይ"</string> + <string name="label_previous_key" msgid="1421141755779895275">"ቀዳሚ"</string> + <string name="label_done_key" msgid="7564866296502630852">"ተደርጓል"</string> + <string name="label_send_key" msgid="482252074224462163">"ላክ"</string> + <string name="label_pause_key" msgid="2225922926459730642">"ቆም በል"</string> + <string name="label_wait_key" msgid="5891247853595466039">"ጠብቅ"</string> </resources> diff --git a/java/res/values-am/strings.xml b/java/res/values-am/strings.xml index a29e22987..0b81034f4 100644 --- a/java/res/values-am/strings.xml +++ b/java/res/values-am/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"ፊደላት (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"ፊደላት (ፒሲ)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"ኢሞጂ"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"የቀለም ዘዴ"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"ነጭ"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"ሰማያዊ"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"የተበጁ የግቤት ስታይሎች"</string> <string name="add_style" msgid="6163126614514489951">"ስታይል አክል"</string> <string name="add" msgid="8299699805688017798">"አክል"</string> diff --git a/java/res/values-ar/strings-action-keys.xml b/java/res/values-ar/strings-action-keys.xml index 99e8f6a73..481b22f20 100644 --- a/java/res/values-ar/strings-action-keys.xml +++ b/java/res/values-ar/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"تنفيذ"</string> - <string name="label_next_key" msgid="362972844525672568">"التالي"</string> - <string name="label_previous_key" msgid="1211868118071386787">"السابق"</string> - <string name="label_done_key" msgid="2441578748772529288">"تم"</string> - <string name="label_send_key" msgid="2815056534433717444">"إرسال"</string> - <string name="label_pause_key" msgid="181098308428035340">"توقف مؤقت"</string> - <string name="label_wait_key" msgid="6402152600878093134">"انتظار"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"ذهاب"</string> + <string name="label_next_key" msgid="5586407279258592635">"تالٍ"</string> + <string name="label_previous_key" msgid="1421141755779895275">"سابق"</string> + <string name="label_done_key" msgid="7564866296502630852">"تم"</string> + <string name="label_send_key" msgid="482252074224462163">"إرسال"</string> + <string name="label_pause_key" msgid="2225922926459730642">"توقف"</string> + <string name="label_wait_key" msgid="5891247853595466039">"انتظر"</string> </resources> diff --git a/java/res/values-ar/strings.xml b/java/res/values-ar/strings.xml index 71f92fb5d..da331196c 100644 --- a/java/res/values-ar/strings.xml +++ b/java/res/values-ar/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"الأبجدية (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"الأبجدية (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"الرموز التعبيرية"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"النمط اللوني"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"أبيض"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"أزرق"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"أنماط الإدخال المخصصة"</string> <string name="add_style" msgid="6163126614514489951">"إضافة نمط"</string> <string name="add" msgid="8299699805688017798">"إضافة"</string> diff --git a/java/res/values-bg/strings-action-keys.xml b/java/res/values-bg/strings-action-keys.xml index 609bf415b..13374a29c 100644 --- a/java/res/values-bg/strings-action-keys.xml +++ b/java/res/values-bg/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Старт"</string> - <string name="label_next_key" msgid="362972844525672568">"Напред"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Пред."</string> - <string name="label_done_key" msgid="2441578748772529288">"Готово"</string> - <string name="label_send_key" msgid="2815056534433717444">"Изпращане"</string> - <string name="label_pause_key" msgid="181098308428035340">"Пауза"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Чака"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Старт"</string> + <string name="label_next_key" msgid="5586407279258592635">"Напред"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Назад"</string> + <string name="label_done_key" msgid="7564866296502630852">"Готово"</string> + <string name="label_send_key" msgid="482252074224462163">"Изпр."</string> + <string name="label_pause_key" msgid="2225922926459730642">"Пауза"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Изчакв."</string> </resources> diff --git a/java/res/values-bg/strings.xml b/java/res/values-bg/strings.xml index 69dec9661..c3fbd7982 100644 --- a/java/res/values-bg/strings.xml +++ b/java/res/values-bg/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Латиница (Коулмак)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Латиница (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Емотикони"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Цветова схема"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Бяло"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Синьо"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Персон. стилове за въвежд."</string> <string name="add_style" msgid="6163126614514489951">"+ стил"</string> <string name="add" msgid="8299699805688017798">"Добавяне"</string> diff --git a/java/res/values-ca/strings-action-keys.xml b/java/res/values-ca/strings-action-keys.xml index 0c0c84efd..9dcf219cc 100644 --- a/java/res/values-ca/strings-action-keys.xml +++ b/java/res/values-ca/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Vés"</string> - <string name="label_next_key" msgid="362972844525672568">"Següent"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Ant."</string> - <string name="label_done_key" msgid="2441578748772529288">"Fet"</string> - <string name="label_send_key" msgid="2815056534433717444">"Envia"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Espera"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Vés"</string> + <string name="label_next_key" msgid="5586407279258592635">"Seg."</string> + <string name="label_previous_key" msgid="1421141755779895275">"Ant."</string> + <string name="label_done_key" msgid="7564866296502630852">"Fet"</string> + <string name="label_send_key" msgid="482252074224462163">"Envia"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Atura"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Esp."</string> </resources> diff --git a/java/res/values-ca/strings.xml b/java/res/values-ca/strings.xml index 95021211d..0b9ee037e 100644 --- a/java/res/values-ca/strings.xml +++ b/java/res/values-ca/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alfabet (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alfabet (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Combinació de colors"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Blanc"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Blau"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Estils d\'entrada personalitzats"</string> <string name="add_style" msgid="6163126614514489951">"Afeg. estil"</string> <string name="add" msgid="8299699805688017798">"Afegeix"</string> diff --git a/java/res/values-cs/strings-action-keys.xml b/java/res/values-cs/strings-action-keys.xml index 700fc78f2..e9545feca 100644 --- a/java/res/values-cs/strings-action-keys.xml +++ b/java/res/values-cs/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Přejít"</string> - <string name="label_next_key" msgid="362972844525672568">"Další"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Před."</string> - <string name="label_done_key" msgid="2441578748772529288">"Hotovo"</string> - <string name="label_send_key" msgid="2815056534433717444">"Odeslat"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pauza"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Čekat"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Jít"</string> + <string name="label_next_key" msgid="5586407279258592635">"Další"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Před."</string> + <string name="label_done_key" msgid="7564866296502630852">"Hot."</string> + <string name="label_send_key" msgid="482252074224462163">"Odes."</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pauza"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Čekat"</string> </resources> diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml index 0f38f45ca..c73e8ab1c 100644 --- a/java/res/values-cs/strings.xml +++ b/java/res/values-cs/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Latinka (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Latinka (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emodži"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Barevné schéma"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Bílá"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Modrá"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Vlastní styl zadávání"</string> <string name="add_style" msgid="6163126614514489951">"Přidat styl"</string> <string name="add" msgid="8299699805688017798">"Přidat"</string> diff --git a/java/res/values-da/strings-action-keys.xml b/java/res/values-da/strings-action-keys.xml index 332f2830d..757dc00d4 100644 --- a/java/res/values-da/strings-action-keys.xml +++ b/java/res/values-da/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Gå"</string> - <string name="label_next_key" msgid="362972844525672568">"Næste"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Forr."</string> - <string name="label_done_key" msgid="2441578748772529288">"Udfør"</string> - <string name="label_send_key" msgid="2815056534433717444">"Send"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Vent"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Start"</string> + <string name="label_next_key" msgid="5586407279258592635">"Næste"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Forr."</string> + <string name="label_done_key" msgid="7564866296502630852">"Udfør"</string> + <string name="label_send_key" msgid="482252074224462163">"Send"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pause"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Vent"</string> </resources> diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml index 839d7cd9e..86bdad469 100644 --- a/java/res/values-da/strings.xml +++ b/java/res/values-da/strings.xml @@ -29,10 +29,10 @@ <string name="popup_on_keypress" msgid="123894815723512944">"Pop op ved tastetryk"</string> <string name="general_category" msgid="1859088467017573195">"Generelt"</string> <string name="correction_category" msgid="2236750915056607613">"Tekstkorrigering"</string> - <string name="gesture_typing_category" msgid="497263612130532630">"Skrivning med berøring"</string> + <string name="gesture_typing_category" msgid="497263612130532630">"Glidende indtastning"</string> <string name="misc_category" msgid="6894192814868233453">"Andre valgmuligheder"</string> <string name="advanced_settings" msgid="362895144495591463">"Avancerede indstillinger"</string> - <string name="advanced_settings_summary" msgid="4487980456152830271">"Muligheder for eksperter"</string> + <string name="advanced_settings_summary" msgid="4487980456152830271">"Indstillinger for øvede"</string> <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Skift inputmetode"</string> <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Tasten til sprogskift gælder også for andre inputmetoder"</string> <string name="show_language_switch_key" msgid="5915478828318774384">"Tast til sprogskift"</string> @@ -68,11 +68,11 @@ <string name="auto_correction_threshold_mode_very_aggressive" msgid="1853309024129480416">"Meget aggressiv"</string> <string name="bigram_prediction" msgid="1084449187723948550">"Forslag til næste ord"</string> <string name="bigram_prediction_summary" msgid="3896362682751109677">"Brug det forrige ord til at give forslag"</string> - <string name="gesture_input" msgid="826951152254563827">"Aktivér skrivning med berøring"</string> + <string name="gesture_input" msgid="826951152254563827">"Aktivér glidende indtastning"</string> <string name="gesture_input_summary" msgid="9180350639305731231">"Skriv et ord ved at glide mellem bogstaverne"</string> - <string name="gesture_preview_trail" msgid="3802333369335722221">"Vis spor af berøring"</string> - <string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dynamisk flydende eks.visning"</string> - <string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Se det foreslåede ord, mens berøringer udføres"</string> + <string name="gesture_preview_trail" msgid="3802333369335722221">"Vis glidende trykspor"</string> + <string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dynamiske ordeksempler"</string> + <string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Se ordforslag ved glidende indtastning"</string> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: Gemt"</string> <string name="spoken_use_headphones" msgid="896961781287283493">"Tilslut et headset for at høre indtastningen blive læst højt ved angivelse af adgangskode."</string> <string name="spoken_current_text_is" msgid="2485723011272583845">"Nuværende tekst er %s"</string> @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alfabet (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alfabet (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Farver"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Hvid"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Blå"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Tilpasset inputtypografi"</string> <string name="add_style" msgid="6163126614514489951">"Tilføj typografi"</string> <string name="add" msgid="8299699805688017798">"Tilføj"</string> @@ -159,7 +162,7 @@ <string name="not_now" msgid="6172462888202790482">"Ikke nu"</string> <string name="custom_input_style_already_exists" msgid="8008728952215449707">"Denne inputstil findes allerede: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Tilstand for brugsstudie"</string> - <string name="prefs_key_longpress_timeout_settings" msgid="6102240298932897873">"For sene lange tastetryk"</string> + <string name="prefs_key_longpress_timeout_settings" msgid="6102240298932897873">"Forsinket langt tastetryk"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="7918341459947439226">"Vibrationstid ved tastetryk"</string> <string name="prefs_keypress_sound_volume_settings" msgid="6027007337036891623">"Lydstyrke ved tastetryk"</string> <string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Læs ekstern ordbogsfil"</string> @@ -169,7 +172,7 @@ <string name="error" msgid="8940763624668513648">"Der opstod en fejl"</string> <string name="button_default" msgid="3988017840431881491">"Standard"</string> <string name="setup_welcome_title" msgid="6112821709832031715">"Velkommen til <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> - <string name="setup_welcome_additional_description" msgid="8150252008545768953">"med Berøringsinput"</string> + <string name="setup_welcome_additional_description" msgid="8150252008545768953">"med glidende indtastning"</string> <string name="setup_start_action" msgid="8936036460897347708">"Kom godt i gang"</string> <string name="setup_next_action" msgid="371821437915144603">"Næste trin"</string> <string name="setup_steps_title" msgid="6400373034871816182">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> konfigureres"</string> diff --git a/java/res/values-de/strings-action-keys.xml b/java/res/values-de/strings-action-keys.xml index 5ec047546..95d3d7119 100644 --- a/java/res/values-de/strings-action-keys.xml +++ b/java/res/values-de/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Los"</string> - <string name="label_next_key" msgid="362972844525672568">"Weiter"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Zurück"</string> - <string name="label_done_key" msgid="2441578748772529288">"Fertig"</string> - <string name="label_send_key" msgid="2815056534433717444">"Senden"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Warten"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Los"</string> + <string name="label_next_key" msgid="5586407279258592635">"Weiter"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Zurück"</string> + <string name="label_done_key" msgid="7564866296502630852">"Fertig"</string> + <string name="label_send_key" msgid="482252074224462163">"Senden"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pause"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Warten"</string> </resources> diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml index 5e35b9ff9..b65053465 100644 --- a/java/res/values-de/strings.xml +++ b/java/res/values-de/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Lat. Alphabet (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Lat. Alphabet (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Farbschema"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Weiß"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Blau"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Benutzerdefinierte Eingabestile"</string> <string name="add_style" msgid="6163126614514489951">"Stil hinzufügen"</string> <string name="add" msgid="8299699805688017798">"Hinzufügen"</string> diff --git a/java/res/values-el/strings-action-keys.xml b/java/res/values-el/strings-action-keys.xml index b890c4b1d..a4093e3dc 100644 --- a/java/res/values-el/strings-action-keys.xml +++ b/java/res/values-el/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Μετ."</string> - <string name="label_next_key" msgid="362972844525672568">"Επόμενο"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Προηγ"</string> - <string name="label_done_key" msgid="2441578748772529288">"Τέλος"</string> - <string name="label_send_key" msgid="2815056534433717444">"Αποστολή"</string> - <string name="label_pause_key" msgid="181098308428035340">"Παύση"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Αναμ."</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Εμπρός"</string> + <string name="label_next_key" msgid="5586407279258592635">"Επόμενο"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Προηγούμενο"</string> + <string name="label_done_key" msgid="7564866296502630852">"Τέλος"</string> + <string name="label_send_key" msgid="482252074224462163">"Αποστολή"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Παύση"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Αναμονή"</string> </resources> diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml index a719077c0..79e83423c 100644 --- a/java/res/values-el/strings.xml +++ b/java/res/values-el/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Αλφάβητο (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Αλφάβητο (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoticon"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Συνδυασμός χρωμάτων"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Λευκές"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Μπλε"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Προσαρμοσ. στυλ εισαγ."</string> <string name="add_style" msgid="6163126614514489951">"Προσθ. στυλ"</string> <string name="add" msgid="8299699805688017798">"Προσθήκη"</string> diff --git a/java/res/values-en-rGB/strings-action-keys.xml b/java/res/values-en-rGB/strings-action-keys.xml index 062907c76..366cf3cdf 100644 --- a/java/res/values-en-rGB/strings-action-keys.xml +++ b/java/res/values-en-rGB/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Go"</string> - <string name="label_next_key" msgid="362972844525672568">"Next"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Prev"</string> - <string name="label_done_key" msgid="2441578748772529288">"Done"</string> - <string name="label_send_key" msgid="2815056534433717444">"Send"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Wait"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Go"</string> + <string name="label_next_key" msgid="5586407279258592635">"Next"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Prev"</string> + <string name="label_done_key" msgid="7564866296502630852">"Finished"</string> + <string name="label_send_key" msgid="482252074224462163">"Send"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pause"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Wait"</string> </resources> diff --git a/java/res/values-en-rGB/strings.xml b/java/res/values-en-rGB/strings.xml index 9e860ecfa..4bc1b15cf 100644 --- a/java/res/values-en-rGB/strings.xml +++ b/java/res/values-en-rGB/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alphabet (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alphabet (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Colour scheme"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"White"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Blue"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Customised input styles"</string> <string name="add_style" msgid="6163126614514489951">"Add style"</string> <string name="add" msgid="8299699805688017798">"Add"</string> diff --git a/java/res/values-en-rIN/strings-action-keys.xml b/java/res/values-en-rIN/strings-action-keys.xml index 062907c76..366cf3cdf 100644 --- a/java/res/values-en-rIN/strings-action-keys.xml +++ b/java/res/values-en-rIN/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Go"</string> - <string name="label_next_key" msgid="362972844525672568">"Next"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Prev"</string> - <string name="label_done_key" msgid="2441578748772529288">"Done"</string> - <string name="label_send_key" msgid="2815056534433717444">"Send"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Wait"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Go"</string> + <string name="label_next_key" msgid="5586407279258592635">"Next"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Prev"</string> + <string name="label_done_key" msgid="7564866296502630852">"Finished"</string> + <string name="label_send_key" msgid="482252074224462163">"Send"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pause"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Wait"</string> </resources> diff --git a/java/res/values-en-rIN/strings.xml b/java/res/values-en-rIN/strings.xml index 9e860ecfa..4bc1b15cf 100644 --- a/java/res/values-en-rIN/strings.xml +++ b/java/res/values-en-rIN/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alphabet (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alphabet (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Colour scheme"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"White"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Blue"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Customised input styles"</string> <string name="add_style" msgid="6163126614514489951">"Add style"</string> <string name="add" msgid="8299699805688017798">"Add"</string> diff --git a/java/res/values-es-rUS/strings-action-keys.xml b/java/res/values-es-rUS/strings-action-keys.xml index b3ad7094b..d375617f4 100644 --- a/java/res/values-es-rUS/strings-action-keys.xml +++ b/java/res/values-es-rUS/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Ir"</string> - <string name="label_next_key" msgid="362972844525672568">"Siguiente"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Ant."</string> - <string name="label_done_key" msgid="2441578748772529288">"Listo"</string> - <string name="label_send_key" msgid="2815056534433717444">"Enviar"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Espera"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Ir"</string> + <string name="label_next_key" msgid="5586407279258592635">"Sig."</string> + <string name="label_previous_key" msgid="1421141755779895275">"Ant."</string> + <string name="label_done_key" msgid="7564866296502630852">"Listo"</string> + <string name="label_send_key" msgid="482252074224462163">"Env."</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pausa"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Esp."</string> </resources> diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml index 1ac080e9c..1fd9cf8f0 100644 --- a/java/res/values-es-rUS/strings.xml +++ b/java/res/values-es-rUS/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alfabeto (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alfabeto (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Combinación de colores"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Blanco"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Azul"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Estilos de entrada personalizados"</string> <string name="add_style" msgid="6163126614514489951">"Agr. estilo"</string> <string name="add" msgid="8299699805688017798">"Agregar"</string> diff --git a/java/res/values-es/strings-action-keys.xml b/java/res/values-es/strings-action-keys.xml index 7c0035074..2701146c8 100644 --- a/java/res/values-es/strings-action-keys.xml +++ b/java/res/values-es/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Ir"</string> - <string name="label_next_key" msgid="362972844525672568">"Sig."</string> - <string name="label_previous_key" msgid="1211868118071386787">"Anterior"</string> - <string name="label_done_key" msgid="2441578748772529288">"Ok"</string> - <string name="label_send_key" msgid="2815056534433717444">"Enviar"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Espera"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Ir"</string> + <string name="label_next_key" msgid="5586407279258592635">"Siguiente"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Anterior"</string> + <string name="label_done_key" msgid="7564866296502630852">"Listo"</string> + <string name="label_send_key" msgid="482252074224462163">"Enviar"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pausar"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Espera"</string> </resources> diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml index d9477da93..39b45e0c4 100644 --- a/java/res/values-es/strings.xml +++ b/java/res/values-es/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alfabeto (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alfabeto (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Patrón de color"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Blanco"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Azul"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Estilos de entrada personalizados"</string> <string name="add_style" msgid="6163126614514489951">"Añadir estilo"</string> <string name="add" msgid="8299699805688017798">"Añadir"</string> diff --git a/java/res/values-et-rEE/strings-action-keys.xml b/java/res/values-et-rEE/strings-action-keys.xml index 07bdb8491..64ba6d6d7 100644 --- a/java/res/values-et-rEE/strings-action-keys.xml +++ b/java/res/values-et-rEE/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Mine"</string> - <string name="label_next_key" msgid="362972844525672568">"Edasi"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Eelm."</string> - <string name="label_done_key" msgid="2441578748772529288">"Valmis"</string> - <string name="label_send_key" msgid="2815056534433717444">"Saada"</string> - <string name="label_pause_key" msgid="181098308428035340">"Peata"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Oota"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Mine"</string> + <string name="label_next_key" msgid="5586407279258592635">"Edasi"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Eelm."</string> + <string name="label_done_key" msgid="7564866296502630852">"Valmis"</string> + <string name="label_send_key" msgid="482252074224462163">"Saada"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Peata"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Oota"</string> </resources> diff --git a/java/res/values-et-rEE/strings.xml b/java/res/values-et-rEE/strings.xml index dc46e8cb2..e0f992c0d 100644 --- a/java/res/values-et-rEE/strings.xml +++ b/java/res/values-et-rEE/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Tähestik (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Tähestik (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emotikon"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Värviskeem"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Valge"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Sinine"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Kohandage sisendlaadid"</string> <string name="add_style" msgid="6163126614514489951">"Lisage laad"</string> <string name="add" msgid="8299699805688017798">"Lisa"</string> diff --git a/java/res/values-fa/strings-action-keys.xml b/java/res/values-fa/strings-action-keys.xml index a3262ed73..78faa8c0b 100644 --- a/java/res/values-fa/strings-action-keys.xml +++ b/java/res/values-fa/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"برو"</string> - <string name="label_next_key" msgid="362972844525672568">"بعدی"</string> - <string name="label_previous_key" msgid="1211868118071386787">"قبلی"</string> - <string name="label_done_key" msgid="2441578748772529288">"انجام شد"</string> - <string name="label_send_key" msgid="2815056534433717444">"ارسال"</string> - <string name="label_pause_key" msgid="181098308428035340">"توقف موقت"</string> - <string name="label_wait_key" msgid="6402152600878093134">"منتظر بمانید"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"رفتن"</string> + <string name="label_next_key" msgid="5586407279258592635">"بعدی"</string> + <string name="label_previous_key" msgid="1421141755779895275">"قبلی"</string> + <string name="label_done_key" msgid="7564866296502630852">"اتمام"</string> + <string name="label_send_key" msgid="482252074224462163">"ارسال"</string> + <string name="label_pause_key" msgid="2225922926459730642">"مکث"</string> + <string name="label_wait_key" msgid="5891247853595466039">"انتظار"</string> </resources> diff --git a/java/res/values-fa/strings.xml b/java/res/values-fa/strings.xml index cfd33c259..af886ef8c 100644 --- a/java/res/values-fa/strings.xml +++ b/java/res/values-fa/strings.xml @@ -151,6 +151,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"حروف الفبا (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"حروف الفبا (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"رنگبندی"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"سفید"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"آبی"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"سبکهای ورودی سفارشی"</string> <string name="add_style" msgid="6163126614514489951">"افزودن سبک"</string> <string name="add" msgid="8299699805688017798">"افزودن"</string> diff --git a/java/res/values-fi/strings-action-keys.xml b/java/res/values-fi/strings-action-keys.xml index dfe1d8e73..da7f11197 100644 --- a/java/res/values-fi/strings-action-keys.xml +++ b/java/res/values-fi/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Mene"</string> - <string name="label_next_key" msgid="362972844525672568">"Seur."</string> - <string name="label_previous_key" msgid="1211868118071386787">"Edel."</string> - <string name="label_done_key" msgid="2441578748772529288">"Valmis"</string> - <string name="label_send_key" msgid="2815056534433717444">"Läh."</string> - <string name="label_pause_key" msgid="181098308428035340">"Tauko"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Odota"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Siir."</string> + <string name="label_next_key" msgid="5586407279258592635">"Seur."</string> + <string name="label_previous_key" msgid="1421141755779895275">"Edel."</string> + <string name="label_done_key" msgid="7564866296502630852">"Valm."</string> + <string name="label_send_key" msgid="482252074224462163">"Läh."</string> + <string name="label_pause_key" msgid="2225922926459730642">"Tauko"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Odota"</string> </resources> diff --git a/java/res/values-fi/strings.xml b/java/res/values-fi/strings.xml index cc2dcd6cf..a58bfac3e 100644 --- a/java/res/values-fi/strings.xml +++ b/java/res/values-fi/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Aakkoset (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Aakkoset (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Väriteema"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Valkoinen"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Sininen"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Muokatut syöttötyylit"</string> <string name="add_style" msgid="6163126614514489951">"Lisää tyyli"</string> <string name="add" msgid="8299699805688017798">"Lisää"</string> diff --git a/java/res/values-fr-rCA/strings-action-keys.xml b/java/res/values-fr-rCA/strings-action-keys.xml index 774e502da..bb5568e79 100644 --- a/java/res/values-fr-rCA/strings-action-keys.xml +++ b/java/res/values-fr-rCA/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Aller"</string> - <string name="label_next_key" msgid="362972844525672568">"Suivant"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Préc."</string> - <string name="label_done_key" msgid="2441578748772529288">"Terminé"</string> - <string name="label_send_key" msgid="2815056534433717444">"Envoyer"</string> - <string name="label_pause_key" msgid="181098308428035340">"Suspendre"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Attendre"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Aller"</string> + <string name="label_next_key" msgid="5586407279258592635">"Suiv."</string> + <string name="label_previous_key" msgid="1421141755779895275">"Préc."</string> + <string name="label_done_key" msgid="7564866296502630852">"Term."</string> + <string name="label_send_key" msgid="482252074224462163">"Env."</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pause"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Att."</string> </resources> diff --git a/java/res/values-fr-rCA/strings.xml b/java/res/values-fr-rCA/strings.xml index 61df43282..2551ce9f8 100644 --- a/java/res/values-fr-rCA/strings.xml +++ b/java/res/values-fr-rCA/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alphabet latin (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alphabet latin (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Modèle de couleurs"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Blanc"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Bleu"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Styles saisie personnalisés"</string> <string name="add_style" msgid="6163126614514489951">"Ajouter style"</string> <string name="add" msgid="8299699805688017798">"Ajouter"</string> diff --git a/java/res/values-fr/strings-action-keys.xml b/java/res/values-fr/strings-action-keys.xml index a22b78816..1c36552d4 100644 --- a/java/res/values-fr/strings-action-keys.xml +++ b/java/res/values-fr/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"OK"</string> - <string name="label_next_key" msgid="362972844525672568">"Suiv."</string> - <string name="label_previous_key" msgid="1211868118071386787">"Préc."</string> - <string name="label_done_key" msgid="2441578748772529288">"OK"</string> - <string name="label_send_key" msgid="2815056534433717444">"Envoi"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Délai"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Accès"</string> + <string name="label_next_key" msgid="5586407279258592635">"Suiv."</string> + <string name="label_previous_key" msgid="1421141755779895275">"Préc."</string> + <string name="label_done_key" msgid="7564866296502630852">"OK"</string> + <string name="label_send_key" msgid="482252074224462163">"Envoyer"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pause"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Attente"</string> </resources> diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml index c0840b221..b877db014 100644 --- a/java/res/values-fr/strings.xml +++ b/java/res/values-fr/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alphabet latin (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alphabet latin (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Jeu de couleurs"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Blanc"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Bleu"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Styles saisie personnalisés"</string> <string name="add_style" msgid="6163126614514489951">"Ajouter style"</string> <string name="add" msgid="8299699805688017798">"Ajouter"</string> diff --git a/java/res/values-hi/strings-action-keys.xml b/java/res/values-hi/strings-action-keys.xml index 456aece7c..92cb194ea 100644 --- a/java/res/values-hi/strings-action-keys.xml +++ b/java/res/values-hi/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"जाएं"</string> - <string name="label_next_key" msgid="362972844525672568">"अगला"</string> - <string name="label_previous_key" msgid="1211868118071386787">"पिछला"</string> - <string name="label_done_key" msgid="2441578748772529288">"पूर्ण"</string> - <string name="label_send_key" msgid="2815056534433717444">"भेजें"</string> - <string name="label_pause_key" msgid="181098308428035340">"पॉज़ करें"</string> - <string name="label_wait_key" msgid="6402152600878093134">"प्रतीक्षा करें"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"जाएं"</string> + <string name="label_next_key" msgid="5586407279258592635">"अगला"</string> + <string name="label_previous_key" msgid="1421141755779895275">"पिछला"</string> + <string name="label_done_key" msgid="7564866296502630852">"पूर्ण"</string> + <string name="label_send_key" msgid="482252074224462163">"भेजें"</string> + <string name="label_pause_key" msgid="2225922926459730642">"रोकें"</string> + <string name="label_wait_key" msgid="5891247853595466039">"प्रतीक्षा करें"</string> </resources> diff --git a/java/res/values-hi/strings.xml b/java/res/values-hi/strings.xml index 08d7315a5..2b06169e7 100644 --- a/java/res/values-hi/strings.xml +++ b/java/res/values-hi/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"वर्णाक्षर (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"वर्णाक्षर (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"रंग संयोजन"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"सफ़ेद"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"नीला"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"कस्टम इनपुट शैलियां"</string> <string name="add_style" msgid="6163126614514489951">"शैली जोड़ें"</string> <string name="add" msgid="8299699805688017798">"जोड़ें"</string> @@ -181,11 +184,11 @@ <string name="setup_step2_instruction" msgid="9141481964870023336">"इसके बाद, \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" को अपनी सक्रिय पाठ-इनपुट पद्धति के रूप में चुनें."</string> <string name="setup_step2_action" msgid="1660330307159824337">"इनपुट पद्धतियां स्विच करें"</string> <string name="setup_step3_title" msgid="3154757183631490281">"बधाई हो, आप बिल्कुल तैयार हैं!"</string> - <string name="setup_step3_instruction" msgid="8025981829605426000">"अब आप <xliff:g id="APPLICATION_NAME">%s</xliff:g> के साथ अपने सभी पसंदीदा एप्स में लिख सकते हैं."</string> + <string name="setup_step3_instruction" msgid="8025981829605426000">"अब आप <xliff:g id="APPLICATION_NAME">%s</xliff:g> के साथ अपने सभी पसंदीदा ऐप्स में लिख सकते हैं."</string> <string name="setup_step3_action" msgid="600879797256942259">"अतिरिक्त भाषाएं कॉन्फ़िगर करना"</string> <string name="setup_finish_action" msgid="276559243409465389">"समाप्त"</string> - <string name="show_setup_wizard_icon" msgid="5008028590593710830">"एप्स आइकन दिखाएं"</string> - <string name="show_setup_wizard_icon_summary" msgid="4119998322536880213">"लॉन्चर में एप्स आइकन प्रदर्शित करें"</string> + <string name="show_setup_wizard_icon" msgid="5008028590593710830">"ऐप्स आइकन दिखाएं"</string> + <string name="show_setup_wizard_icon_summary" msgid="4119998322536880213">"लॉन्चर में ऐप्स आइकन प्रदर्शित करें"</string> <string name="app_name" msgid="6320102637491234792">"डिक्शनरी प्रदाता"</string> <string name="dictionary_provider_name" msgid="3027315045397363079">"डिक्शनरी प्रदाता"</string> <string name="dictionary_service_name" msgid="6237472350693511448">"डिक्शनरी सेवा"</string> diff --git a/java/res/values-hr/strings-action-keys.xml b/java/res/values-hr/strings-action-keys.xml index c475c799f..564f70363 100644 --- a/java/res/values-hr/strings-action-keys.xml +++ b/java/res/values-hr/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Idi"</string> - <string name="label_next_key" msgid="362972844525672568">"Dalje"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Pret."</string> - <string name="label_done_key" msgid="2441578748772529288">"Gotovo"</string> - <string name="label_send_key" msgid="2815056534433717444">"Pošalji"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pauza"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Pričekaj"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Kreni"</string> + <string name="label_next_key" msgid="5586407279258592635">"Dalje"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Pret."</string> + <string name="label_done_key" msgid="7564866296502630852">"Got."</string> + <string name="label_send_key" msgid="482252074224462163">"Poš."</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pauz."</string> + <string name="label_wait_key" msgid="5891247853595466039">"Čekaj"</string> </resources> diff --git a/java/res/values-hr/strings.xml b/java/res/values-hr/strings.xml index e5f4731ba..b9cfef384 100644 --- a/java/res/values-hr/strings.xml +++ b/java/res/values-hr/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Abeceda (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Abeceda (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Shema boja"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Bijela"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Plava"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Prilagođeni stilovi unosa"</string> <string name="add_style" msgid="6163126614514489951">"Dodaj stil"</string> <string name="add" msgid="8299699805688017798">"Dodaj"</string> diff --git a/java/res/values-hu/strings-action-keys.xml b/java/res/values-hu/strings-action-keys.xml index eb72ac8d0..257f30f34 100644 --- a/java/res/values-hu/strings-action-keys.xml +++ b/java/res/values-hu/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Ugrás"</string> - <string name="label_next_key" msgid="362972844525672568">"Tovább"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Előző"</string> - <string name="label_done_key" msgid="2441578748772529288">"Kész"</string> - <string name="label_send_key" msgid="2815056534433717444">"Küldés"</string> - <string name="label_pause_key" msgid="181098308428035340">"Szün."</string> - <string name="label_wait_key" msgid="6402152600878093134">"Vár"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Mehet"</string> + <string name="label_next_key" msgid="5586407279258592635">"Köv."</string> + <string name="label_previous_key" msgid="1421141755779895275">"Előző"</string> + <string name="label_done_key" msgid="7564866296502630852">"Kész"</string> + <string name="label_send_key" msgid="482252074224462163">"Küld"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Állj"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Vár"</string> </resources> diff --git a/java/res/values-hu/strings.xml b/java/res/values-hu/strings.xml index bcd229675..a61378fca 100644 --- a/java/res/values-hu/strings.xml +++ b/java/res/values-hu/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Ábécé (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Ábécé (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Hangulatjel"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Színséma"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Fehér"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Kék"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Egyedi bevitelstílusok"</string> <string name="add_style" msgid="6163126614514489951">"Új stílus"</string> <string name="add" msgid="8299699805688017798">"Hozzáadás"</string> diff --git a/java/res/values-hy-rAM/strings-action-keys.xml b/java/res/values-hy-rAM/strings-action-keys.xml index f9400559f..af9dd5d9d 100644 --- a/java/res/values-hy-rAM/strings-action-keys.xml +++ b/java/res/values-hy-rAM/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Առաջ"</string> - <string name="label_next_key" msgid="362972844525672568">"Հաջորդը"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Նխրդ"</string> - <string name="label_done_key" msgid="2441578748772529288">"Կատարված է"</string> - <string name="label_send_key" msgid="2815056534433717444">"Ուղարկել"</string> - <string name="label_pause_key" msgid="181098308428035340">"Դադար"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Սպասել"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Առաջ"</string> + <string name="label_next_key" msgid="5586407279258592635">"Հաջորդը"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Նախորդը"</string> + <string name="label_done_key" msgid="7564866296502630852">"Պատրաստ է"</string> + <string name="label_send_key" msgid="482252074224462163">"Ուղարկել"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Դադարեցնել"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Սպասել"</string> </resources> diff --git a/java/res/values-hy-rAM/strings.xml b/java/res/values-hy-rAM/strings.xml index 76b0a08b9..0b8e19a76 100644 --- a/java/res/values-hy-rAM/strings.xml +++ b/java/res/values-hy-rAM/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Այբուբեն (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Այբուբեն (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Զմայլիկներ"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Գունավորում"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Սպիտակ"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Կապույտ"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Մուտքագրման հատուկ ոճեր"</string> <string name="add_style" msgid="6163126614514489951">"Ավելացնել ոճ"</string> <string name="add" msgid="8299699805688017798">"Ավելացնել"</string> diff --git a/java/res/values-in/strings-action-keys.xml b/java/res/values-in/strings-action-keys.xml index 85f7e7809..26f32254d 100644 --- a/java/res/values-in/strings-action-keys.xml +++ b/java/res/values-in/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Buka"</string> - <string name="label_next_key" msgid="362972844525672568">"Berikutnya"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Sblm"</string> - <string name="label_done_key" msgid="2441578748772529288">"Selesai"</string> - <string name="label_send_key" msgid="2815056534433717444">"Kirimkan"</string> - <string name="label_pause_key" msgid="181098308428035340">"Jeda"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Tunggu"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Buka"</string> + <string name="label_next_key" msgid="5586407279258592635">"Lanjut"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Balik"</string> + <string name="label_done_key" msgid="7564866296502630852">"Beres"</string> + <string name="label_send_key" msgid="482252074224462163">"Kirim"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Jeda"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Tunggu"</string> </resources> diff --git a/java/res/values-in/strings.xml b/java/res/values-in/strings.xml index 99aa8640a..d83a22c6c 100644 --- a/java/res/values-in/strings.xml +++ b/java/res/values-in/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Abjad (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Abjad (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Skema warna"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Putih"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Biru"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Gaya masukan khusus"</string> <string name="add_style" msgid="6163126614514489951">"Tambah gaya"</string> <string name="add" msgid="8299699805688017798">"Tambahkan"</string> diff --git a/java/res/values-it/strings-action-keys.xml b/java/res/values-it/strings-action-keys.xml index ecf02f58c..02e7b9c94 100644 --- a/java/res/values-it/strings-action-keys.xml +++ b/java/res/values-it/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Vai"</string> - <string name="label_next_key" msgid="362972844525672568">"Avanti"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Indietro"</string> - <string name="label_done_key" msgid="2441578748772529288">"Fine"</string> - <string name="label_send_key" msgid="2815056534433717444">"Invia"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Attesa"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Vai"</string> + <string name="label_next_key" msgid="5586407279258592635">"Succ."</string> + <string name="label_previous_key" msgid="1421141755779895275">"Prec."</string> + <string name="label_done_key" msgid="7564866296502630852">"Fine"</string> + <string name="label_send_key" msgid="482252074224462163">"Invia"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pausa"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Attendi"</string> </resources> diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml index 7dd9692b9..1111c4901 100644 --- a/java/res/values-it/strings.xml +++ b/java/res/values-it/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alfabeto (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alfabeto (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Combinazione di colori"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Bianco"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Blu"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Stili personalizzati"</string> <string name="add_style" msgid="6163126614514489951">"Aggiungi stile"</string> <string name="add" msgid="8299699805688017798">"Aggiungi"</string> diff --git a/java/res/values-iw/strings-action-keys.xml b/java/res/values-iw/strings-action-keys.xml index cfd6a7b4e..f0f466b8e 100644 --- a/java/res/values-iw/strings-action-keys.xml +++ b/java/res/values-iw/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"התחל"</string> - <string name="label_next_key" msgid="362972844525672568">"הבא"</string> - <string name="label_previous_key" msgid="1211868118071386787">"הקודם"</string> - <string name="label_done_key" msgid="2441578748772529288">"בוצע"</string> - <string name="label_send_key" msgid="2815056534433717444">"שלח"</string> - <string name="label_pause_key" msgid="181098308428035340">"השהה"</string> - <string name="label_wait_key" msgid="6402152600878093134">"המתן"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"התחל"</string> + <string name="label_next_key" msgid="5586407279258592635">"הבא"</string> + <string name="label_previous_key" msgid="1421141755779895275">"הקודם"</string> + <string name="label_done_key" msgid="7564866296502630852">"בוצע"</string> + <string name="label_send_key" msgid="482252074224462163">"שלח"</string> + <string name="label_pause_key" msgid="2225922926459730642">"השהה"</string> + <string name="label_wait_key" msgid="5891247853595466039">"המתן"</string> </resources> diff --git a/java/res/values-iw/strings.xml b/java/res/values-iw/strings.xml index dd185af91..8d02e685b 100644 --- a/java/res/values-iw/strings.xml +++ b/java/res/values-iw/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"אלף-בית (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"אלף-בית (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"אמוג\'י"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"ערכת צבעים"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"לבן"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"כחול"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"סגנונות קלט מותאמים אישית"</string> <string name="add_style" msgid="6163126614514489951">"הוסף סגנון"</string> <string name="add" msgid="8299699805688017798">"הוסף"</string> @@ -210,7 +213,7 @@ <string name="install_dict" msgid="180852772562189365">"התקן"</string> <string name="cancel_download_dict" msgid="7843340278507019303">"בטל"</string> <string name="delete_dict" msgid="756853268088330054">"מחק"</string> - <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"לשפה הנבחרת במכשיר הנייד שלך יש מילון זמין.<br/> אנו ממליצים <b>להוריד</b> את המילון ב<xliff:g id="LANGUAGE">%1$s</xliff:g> כדי לשפר את חוויית ההקלדה.<br/> <br/> ההורדה עשויה לארוך דקה או שתיים ב-3G. ייתכן שתחויב אם אין לך <b>תוכנית נתונים בלתי מוגבלת</b>.<br/> אם אינך בטוח איזו תוכנית נתונים יש לך, אנו ממליצים לחפש חיבור Wi-Fi כדי להתחיל בהורדה באופן אוטומטי.<br/> <br/> טיפ: ניתן להוריד ולהסיר מילונים ב<b>שפה וקלט</b> בתפריט <b>הגדרות</b> של המכשיר הנייד שלך."</string> + <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"לשפה הנבחרת במכשיר הנייד שלך יש מילון זמין.<br/> אנו ממליצים <b>להוריד</b> את המילון ב<xliff:g id="LANGUAGE">%1$s</xliff:g> כדי לשפר את חוויית ההקלדה.<br/> <br/> ההורדה עשויה לארוך דקה או שתיים ב-3G. ייתכן שתחויב אם אין לך <b>תכנית נתונים בלתי מוגבלת</b>.<br/> אם אינך בטוח איזו תכנית נתונים יש לך, אנו ממליצים לחפש חיבור Wi-Fi כדי להתחיל בהורדה באופן אוטומטי.<br/> <br/> טיפ: ניתן להוריד ולהסיר מילונים ב<b>שפה וקלט</b> בתפריט <b>הגדרות</b> של המכשיר הנייד שלך."</string> <string name="download_over_metered" msgid="1643065851159409546">"הורד עכשיו (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g>MB)"</string> <string name="do_not_download_over_metered" msgid="2176209579313941583">"הורד באמצעות Wi-Fi"</string> <string name="dict_available_notification_title" msgid="6514288591959117288">"יש מילון זמין עבור <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string> diff --git a/java/res/values-ja/strings-action-keys.xml b/java/res/values-ja/strings-action-keys.xml index 342dc9a4d..68aa6479e 100644 --- a/java/res/values-ja/strings-action-keys.xml +++ b/java/res/values-ja/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"実行"</string> - <string name="label_next_key" msgid="362972844525672568">"次へ"</string> - <string name="label_previous_key" msgid="1211868118071386787">"前へ"</string> - <string name="label_done_key" msgid="2441578748772529288">"完了"</string> - <string name="label_send_key" msgid="2815056534433717444">"送信"</string> - <string name="label_pause_key" msgid="181098308428035340">"停止"</string> - <string name="label_wait_key" msgid="6402152600878093134">"待機"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"実行"</string> + <string name="label_next_key" msgid="5586407279258592635">"次へ"</string> + <string name="label_previous_key" msgid="1421141755779895275">"前へ"</string> + <string name="label_done_key" msgid="7564866296502630852">"完了"</string> + <string name="label_send_key" msgid="482252074224462163">"送信"</string> + <string name="label_pause_key" msgid="2225922926459730642">"停止"</string> + <string name="label_wait_key" msgid="5891247853595466039">"待機"</string> </resources> diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml index f7e51d320..fbfd3b7f7 100644 --- a/java/res/values-ja/strings.xml +++ b/java/res/values-ja/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"アルファベット（Colemak）"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"アルファベット（PC）"</string> <string name="subtype_emoji" msgid="7483586578074549196">"絵文字"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"カラーパターン"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"白"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"青"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"カスタム入力スタイル"</string> <string name="add_style" msgid="6163126614514489951">"スタイル追加"</string> <string name="add" msgid="8299699805688017798">"追加"</string> diff --git a/java/res/values-ka-rGE/strings-action-keys.xml b/java/res/values-ka-rGE/strings-action-keys.xml index 13066ad8a..e2dd05f7b 100644 --- a/java/res/values-ka-rGE/strings-action-keys.xml +++ b/java/res/values-ka-rGE/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"წასვლა"</string> - <string name="label_next_key" msgid="362972844525672568">"შემდ."</string> - <string name="label_previous_key" msgid="1211868118071386787">"წინა"</string> - <string name="label_done_key" msgid="2441578748772529288">"დასრულდა"</string> - <string name="label_send_key" msgid="2815056534433717444">"გაგზ."</string> - <string name="label_pause_key" msgid="181098308428035340">"პაუზა"</string> - <string name="label_wait_key" msgid="6402152600878093134">"მოცდა"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"გად."</string> + <string name="label_next_key" msgid="5586407279258592635">"შემდ."</string> + <string name="label_previous_key" msgid="1421141755779895275">"წინა"</string> + <string name="label_done_key" msgid="7564866296502630852">"დასრ."</string> + <string name="label_send_key" msgid="482252074224462163">"გაგზ."</string> + <string name="label_pause_key" msgid="2225922926459730642">"პაუზა"</string> + <string name="label_wait_key" msgid="5891247853595466039">"მოცდა"</string> </resources> diff --git a/java/res/values-ka-rGE/strings.xml b/java/res/values-ka-rGE/strings.xml index 71ed65783..dec6b3a6b 100644 --- a/java/res/values-ka-rGE/strings.xml +++ b/java/res/values-ka-rGE/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"ანბანი (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"ანბანი (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"სიცილაკები"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"ფერის სქემა"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"თეთრი"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"ლურჯი"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"შეყვანის სტილების კონფიგურაცია"</string> <string name="add_style" msgid="6163126614514489951">"სტილის დამატება"</string> <string name="add" msgid="8299699805688017798">"დამატება"</string> diff --git a/java/res/values-km-rKH/strings-action-keys.xml b/java/res/values-km-rKH/strings-action-keys.xml index e90fba8bc..ff747d9f5 100644 --- a/java/res/values-km-rKH/strings-action-keys.xml +++ b/java/res/values-km-rKH/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"ទៅ"</string> - <string name="label_next_key" msgid="362972844525672568">"បន្ទាប់"</string> - <string name="label_previous_key" msgid="1211868118071386787">"មុន"</string> - <string name="label_done_key" msgid="2441578748772529288">"រួចរាល់"</string> - <string name="label_send_key" msgid="2815056534433717444">"ផ្ញើ"</string> - <string name="label_pause_key" msgid="181098308428035340">"ផ្អាក"</string> - <string name="label_wait_key" msgid="6402152600878093134">"រង់ចាំ"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"ទៅ"</string> + <string name="label_next_key" msgid="5586407279258592635">"បន្ទាប់"</string> + <string name="label_previous_key" msgid="1421141755779895275">"មុន"</string> + <string name="label_done_key" msgid="7564866296502630852">"រួចរាល់"</string> + <string name="label_send_key" msgid="482252074224462163">"ផ្ញើ"</string> + <string name="label_pause_key" msgid="2225922926459730642">"ផ្អាក"</string> + <string name="label_wait_key" msgid="5891247853595466039">"រង់ចាំ"</string> </resources> diff --git a/java/res/values-km-rKH/strings.xml b/java/res/values-km-rKH/strings.xml index b9cd32da6..86ecc5e10 100644 --- a/java/res/values-km-rKH/strings.xml +++ b/java/res/values-km-rKH/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"តាមលំដាប់អក្សរក្រម (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"តាមលំដាប់អក្សរក្រម (កុំព្យូទ័រ)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"សញ្ញាអារម្មណ៍"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"ពណ៌ចម្រុះ"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"ស"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"ខៀវ"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"រចនាប័ទ្មបញ្ចូលផ្ទាល់ខ្លួន"</string> <string name="add_style" msgid="6163126614514489951">"បន្ថែមរចនាប័ទ្ម"</string> <string name="add" msgid="8299699805688017798">"បន្ថែម"</string> diff --git a/java/res/values-ko/strings-action-keys.xml b/java/res/values-ko/strings-action-keys.xml index 42991242b..04febeeea 100644 --- a/java/res/values-ko/strings-action-keys.xml +++ b/java/res/values-ko/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"이동"</string> - <string name="label_next_key" msgid="362972844525672568">"다음"</string> - <string name="label_previous_key" msgid="1211868118071386787">"이전"</string> - <string name="label_done_key" msgid="2441578748772529288">"완료"</string> - <string name="label_send_key" msgid="2815056534433717444">"전송"</string> - <string name="label_pause_key" msgid="181098308428035340">"일시 중지"</string> - <string name="label_wait_key" msgid="6402152600878093134">"대기"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"이동"</string> + <string name="label_next_key" msgid="5586407279258592635">"다음"</string> + <string name="label_previous_key" msgid="1421141755779895275">"이전"</string> + <string name="label_done_key" msgid="7564866296502630852">"완료"</string> + <string name="label_send_key" msgid="482252074224462163">"전송"</string> + <string name="label_pause_key" msgid="2225922926459730642">"중지"</string> + <string name="label_wait_key" msgid="5891247853595466039">"대기"</string> </resources> diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml index 259a142dd..ca10bdf52 100644 --- a/java/res/values-ko/strings.xml +++ b/java/res/values-ko/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"알파벳(콜맥)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"알파벳(PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"이모티콘"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"색구성표"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"흰색"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"파란색"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"맞춤 입력 스타일"</string> <string name="add_style" msgid="6163126614514489951">"스타일 추가"</string> <string name="add" msgid="8299699805688017798">"추가"</string> diff --git a/java/res/values-lo-rLA/strings-action-keys.xml b/java/res/values-lo-rLA/strings-action-keys.xml index 8cb6a241f..08dc983e0 100644 --- a/java/res/values-lo-rLA/strings-action-keys.xml +++ b/java/res/values-lo-rLA/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"ໄປ"</string> - <string name="label_next_key" msgid="362972844525672568">"ຕໍ່ໄປ"</string> - <string name="label_previous_key" msgid="1211868118071386787">"ກ່ອນໜ້າ"</string> - <string name="label_done_key" msgid="2441578748772529288">"ແລ້ວໆ"</string> - <string name="label_send_key" msgid="2815056534433717444">"ສົ່ງ"</string> - <string name="label_pause_key" msgid="181098308428035340">"ຄ້າງໄວ້"</string> - <string name="label_wait_key" msgid="6402152600878093134">"ລໍຖ້າ"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"ໄປ"</string> + <string name="label_next_key" msgid="5586407279258592635">"ຕໍ່ໄປ"</string> + <string name="label_previous_key" msgid="1421141755779895275">"ກ່ອນໜ້າ"</string> + <string name="label_done_key" msgid="7564866296502630852">"Done"</string> + <string name="label_send_key" msgid="482252074224462163">"ສົ່ງ"</string> + <string name="label_pause_key" msgid="2225922926459730642">"ຢຸດຊົ່ວຄາວ"</string> + <string name="label_wait_key" msgid="5891247853595466039">"ລໍຖ້າ"</string> </resources> diff --git a/java/res/values-lo-rLA/strings.xml b/java/res/values-lo-rLA/strings.xml index b1b02cce7..a4dbc2de2 100644 --- a/java/res/values-lo-rLA/strings.xml +++ b/java/res/values-lo-rLA/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"ໂຕອັກສອນ (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"ໂຕອັກສອນ (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"ອີໂມຈິ"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"ຮູບແບບສີ"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"ສີຂາວ"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"ສີຟ້າ"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"ຮູບແບບການປ້ອນຂໍ້ມູນສ່ວນຕົວ"</string> <string name="add_style" msgid="6163126614514489951">"ເພີ່ມຮູບແບບ"</string> <string name="add" msgid="8299699805688017798">"ເພີ່ມ"</string> diff --git a/java/res/values-lt/strings-action-keys.xml b/java/res/values-lt/strings-action-keys.xml index c1309b75c..39b3894be 100644 --- a/java/res/values-lt/strings-action-keys.xml +++ b/java/res/values-lt/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Pradėti"</string> - <string name="label_next_key" msgid="362972844525672568">"Kitas"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Anks."</string> - <string name="label_done_key" msgid="2441578748772529288">"Atlikta"</string> - <string name="label_send_key" msgid="2815056534433717444">"Siųsti"</string> - <string name="label_pause_key" msgid="181098308428035340">"Prist."</string> - <string name="label_wait_key" msgid="6402152600878093134">"Lauk."</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Prad."</string> + <string name="label_next_key" msgid="5586407279258592635">"Kitas"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Anks."</string> + <string name="label_done_key" msgid="7564866296502630852">"Atl."</string> + <string name="label_send_key" msgid="482252074224462163">"Siųs."</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pris."</string> + <string name="label_wait_key" msgid="5891247853595466039">"Lauk."</string> </resources> diff --git a/java/res/values-lt/strings.xml b/java/res/values-lt/strings.xml index 4a6daab8b..1f943944c 100644 --- a/java/res/values-lt/strings.xml +++ b/java/res/values-lt/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Abėcėlė („Colemak“)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Abėcėlė (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Jaustukai"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Spalvų schema"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Balta"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Mėlyna"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Pasirinkti įvesties stilių"</string> <string name="add_style" msgid="6163126614514489951">"Prid. stilių"</string> <string name="add" msgid="8299699805688017798">"Pridėti"</string> diff --git a/java/res/values-lv/strings-action-keys.xml b/java/res/values-lv/strings-action-keys.xml index d6750d02a..c2fbda26b 100644 --- a/java/res/values-lv/strings-action-keys.xml +++ b/java/res/values-lv/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Sākt"</string> - <string name="label_next_key" msgid="362972844525672568">"Tālāk"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Iepr."</string> - <string name="label_done_key" msgid="2441578748772529288">"Gatavs"</string> - <string name="label_send_key" msgid="2815056534433717444">"Sūtīt"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pauze"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Gaidīt"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Sākt"</string> + <string name="label_next_key" msgid="5586407279258592635">"Tālāk"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Iepr."</string> + <string name="label_done_key" msgid="7564866296502630852">"Gatavs"</string> + <string name="label_send_key" msgid="482252074224462163">"Sūtīt"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pauze"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Gaidīt"</string> </resources> diff --git a/java/res/values-lv/strings.xml b/java/res/values-lv/strings.xml index 5770c2959..8ea24edb7 100644 --- a/java/res/values-lv/strings.xml +++ b/java/res/values-lv/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alfabēts (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alfabēts (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Japāņu emocijzīmes"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Krāsu shēma"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Balta"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Zila"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Pielāg. ievades stili"</string> <string name="add_style" msgid="6163126614514489951">"Piev. stilu"</string> <string name="add" msgid="8299699805688017798">"Pievienot"</string> diff --git a/java/res/values-mn-rMN/strings-action-keys.xml b/java/res/values-mn-rMN/strings-action-keys.xml index 7cf345e7c..77b8f2c05 100644 --- a/java/res/values-mn-rMN/strings-action-keys.xml +++ b/java/res/values-mn-rMN/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Явах"</string> - <string name="label_next_key" msgid="362972844525672568">"Дараах"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Өмнөх"</string> - <string name="label_done_key" msgid="2441578748772529288">"Дууссан"</string> - <string name="label_send_key" msgid="2815056534433717444">"Илгээх"</string> - <string name="label_pause_key" msgid="181098308428035340">"Пауз"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Хүлээх"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Очих"</string> + <string name="label_next_key" msgid="5586407279258592635">"Дараах"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Өмнөх"</string> + <string name="label_done_key" msgid="7564866296502630852">"Дууссан"</string> + <string name="label_send_key" msgid="482252074224462163">"Илгээх"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Түр зогсоох"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Хүлээх"</string> </resources> diff --git a/java/res/values-mn-rMN/strings.xml b/java/res/values-mn-rMN/strings.xml index 658f6d8af..d4175899f 100644 --- a/java/res/values-mn-rMN/strings.xml +++ b/java/res/values-mn-rMN/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Цагаан толгой (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Цагаан толгой (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Инээмсэглэл"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Өнгөний схем"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Цагаан"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Хөх"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Өөрийн оруулах загвар"</string> <string name="add_style" msgid="6163126614514489951">"Загвар нэмэх"</string> <string name="add" msgid="8299699805688017798">"Нэмэх"</string> diff --git a/java/res/values-ms-rMY/strings-action-keys.xml b/java/res/values-ms-rMY/strings-action-keys.xml index 5f14b84ec..f1a75d2ef 100644 --- a/java/res/values-ms-rMY/strings-action-keys.xml +++ b/java/res/values-ms-rMY/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Pergi"</string> - <string name="label_next_key" msgid="362972844525672568">"Seterusnya"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Sblm"</string> - <string name="label_done_key" msgid="2441578748772529288">"Selesai"</string> - <string name="label_send_key" msgid="2815056534433717444">"Hantar"</string> - <string name="label_pause_key" msgid="181098308428035340">"Jeda"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Tunggu"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Pergi"</string> + <string name="label_next_key" msgid="5586407279258592635">"Slps"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Sblm"</string> + <string name="label_done_key" msgid="7564866296502630852">"Siap"</string> + <string name="label_send_key" msgid="482252074224462163">"Hntr"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Jeda"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Tggu"</string> </resources> diff --git a/java/res/values-ms-rMY/strings.xml b/java/res/values-ms-rMY/strings.xml index a87454891..c9b4a0359 100644 --- a/java/res/values-ms-rMY/strings.xml +++ b/java/res/values-ms-rMY/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Abjad (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Abjad (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Skim warna"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Putih"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Biru"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Gaya input peribadi"</string> <string name="add_style" msgid="6163126614514489951">"Tambah gaya"</string> <string name="add" msgid="8299699805688017798">"Tambah"</string> diff --git a/java/res/values-nb/strings-action-keys.xml b/java/res/values-nb/strings-action-keys.xml index 840e8c842..d4acd36c9 100644 --- a/java/res/values-nb/strings-action-keys.xml +++ b/java/res/values-nb/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Utfør"</string> - <string name="label_next_key" msgid="362972844525672568">"Neste"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Forr."</string> - <string name="label_done_key" msgid="2441578748772529288">"Utfør"</string> - <string name="label_send_key" msgid="2815056534433717444">"Send"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Vent"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Utfør"</string> + <string name="label_next_key" msgid="5586407279258592635">"Neste"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Forrige"</string> + <string name="label_done_key" msgid="7564866296502630852">"Ferdig"</string> + <string name="label_send_key" msgid="482252074224462163">"Send"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pause"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Vent"</string> </resources> diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml index 500fc3301..f90aa6d0b 100644 --- a/java/res/values-nb/strings.xml +++ b/java/res/values-nb/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alfabet (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alfabet (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Fargetema"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Hvit"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Blå"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Egendefinerte inndata"</string> <string name="add_style" msgid="6163126614514489951">"Legg til stil"</string> <string name="add" msgid="8299699805688017798">"Legg til"</string> diff --git a/java/res/values-nl/strings-action-keys.xml b/java/res/values-nl/strings-action-keys.xml index 3a6967fc2..c1ce25acf 100644 --- a/java/res/values-nl/strings-action-keys.xml +++ b/java/res/values-nl/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Start"</string> - <string name="label_next_key" msgid="362972844525672568">"Verder"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Vorig"</string> - <string name="label_done_key" msgid="2441578748772529288">"Gereed"</string> - <string name="label_send_key" msgid="2815056534433717444">"Zenden"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pauze"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Wacht"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Ga"</string> + <string name="label_next_key" msgid="5586407279258592635">"Volg."</string> + <string name="label_previous_key" msgid="1421141755779895275">"Vorig"</string> + <string name="label_done_key" msgid="7564866296502630852">"Klaar"</string> + <string name="label_send_key" msgid="482252074224462163">"Verz."</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pauze"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Wacht"</string> </resources> diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml index 4413b273d..dcbf2c09c 100644 --- a/java/res/values-nl/strings.xml +++ b/java/res/values-nl/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alfabet (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alfabet (pc)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Kleurenschema"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Wit"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Blauw"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Aangep. invoerstijlen"</string> <string name="add_style" msgid="6163126614514489951">"Stijl toev."</string> <string name="add" msgid="8299699805688017798">"Toevoegen"</string> diff --git a/java/res/values-pl/strings-action-keys.xml b/java/res/values-pl/strings-action-keys.xml index 4bbceeacf..2984b98b8 100644 --- a/java/res/values-pl/strings-action-keys.xml +++ b/java/res/values-pl/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"OK"</string> - <string name="label_next_key" msgid="362972844525672568">"Dalej"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Wstecz"</string> - <string name="label_done_key" msgid="2441578748772529288">"OK"</string> - <string name="label_send_key" msgid="2815056534433717444">"Wyślij"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pauza"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Czekaj"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"OK"</string> + <string name="label_next_key" msgid="5586407279258592635">"Dalej"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Wróć"</string> + <string name="label_done_key" msgid="7564866296502630852">"Gotowe"</string> + <string name="label_send_key" msgid="482252074224462163">"Wyślij"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pauza"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Czekaj"</string> </resources> diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml index d36cd49ba..c78674a9b 100644 --- a/java/res/values-pl/strings.xml +++ b/java/res/values-pl/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alfabet (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alfabet (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emotikony"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Schemat kolorów"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Biały"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Niebieski"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Style niestandardowe"</string> <string name="add_style" msgid="6163126614514489951">"Dodaj styl"</string> <string name="add" msgid="8299699805688017798">"Dodaj"</string> diff --git a/java/res/values-pt-rPT/strings-action-keys.xml b/java/res/values-pt-rPT/strings-action-keys.xml index 88d9ceb9b..7a7559fea 100644 --- a/java/res/values-pt-rPT/strings-action-keys.xml +++ b/java/res/values-pt-rPT/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Ir"</string> - <string name="label_next_key" msgid="362972844525672568">"Avançar"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Ant."</string> - <string name="label_done_key" msgid="2441578748772529288">"OK"</string> - <string name="label_send_key" msgid="2815056534433717444">"Enviar"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Esp."</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Ok"</string> + <string name="label_next_key" msgid="5586407279258592635">"Seg."</string> + <string name="label_previous_key" msgid="1421141755779895275">"Ant."</string> + <string name="label_done_key" msgid="7564866296502630852">"Conc."</string> + <string name="label_send_key" msgid="482252074224462163">"Env."</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pausa"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Esp."</string> </resources> diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml index c7eb06563..c27758116 100644 --- a/java/res/values-pt-rPT/strings.xml +++ b/java/res/values-pt-rPT/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alfabeto (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alfabeto (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Esquema de cor"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Branco"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Azul"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Estilos entrada pers."</string> <string name="add_style" msgid="6163126614514489951">"Adic. estilo"</string> <string name="add" msgid="8299699805688017798">"Adicionar"</string> diff --git a/java/res/values-pt/strings-action-keys.xml b/java/res/values-pt/strings-action-keys.xml index e007dc009..1d8e760e7 100644 --- a/java/res/values-pt/strings-action-keys.xml +++ b/java/res/values-pt/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Ir"</string> - <string name="label_next_key" msgid="362972844525672568">"Avançar"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Volt."</string> - <string name="label_done_key" msgid="2441578748772529288">"Feito"</string> - <string name="label_send_key" msgid="2815056534433717444">"Enviar"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Esp."</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Ir"</string> + <string name="label_next_key" msgid="5586407279258592635">"Próx."</string> + <string name="label_previous_key" msgid="1421141755779895275">"Ant."</string> + <string name="label_done_key" msgid="7564866296502630852">"Conc."</string> + <string name="label_send_key" msgid="482252074224462163">"Env."</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pausa"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Esp."</string> </resources> diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml index 2aa7f7739..f98ef8cd6 100644 --- a/java/res/values-pt/strings.xml +++ b/java/res/values-pt/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alfabeto (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alfabeto (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Esquema de cores"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Branco"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Azul"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Estilos personalizados"</string> <string name="add_style" msgid="6163126614514489951">"Adic. estilo"</string> <string name="add" msgid="8299699805688017798">"Adicionar"</string> diff --git a/java/res/values-ro/strings-action-keys.xml b/java/res/values-ro/strings-action-keys.xml index cdb913452..51aa82f9c 100644 --- a/java/res/values-ro/strings-action-keys.xml +++ b/java/res/values-ro/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"OK"</string> - <string name="label_next_key" msgid="362972844525672568">"Înainte"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Înapoi"</string> - <string name="label_done_key" msgid="2441578748772529288">"Terminat"</string> - <string name="label_send_key" msgid="2815056534433717444">"Trimiteţi"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pauză"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Aşt."</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Start"</string> + <string name="label_next_key" msgid="5586407279258592635">"Înai."</string> + <string name="label_previous_key" msgid="1421141755779895275">"Înap."</string> + <string name="label_done_key" msgid="7564866296502630852">"Gata"</string> + <string name="label_send_key" msgid="482252074224462163">"Trim."</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pauză"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Așt."</string> </resources> diff --git a/java/res/values-ro/strings.xml b/java/res/values-ro/strings.xml index ad4456aad..147f83e61 100644 --- a/java/res/values-ro/strings.xml +++ b/java/res/values-ro/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alfabet (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alfabet (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Schemă de culori"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Alb"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Albastru"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Stiluri personalizate"</string> <string name="add_style" msgid="6163126614514489951">"Stil"</string> <string name="add" msgid="8299699805688017798">"Adăugaţi"</string> diff --git a/java/res/values-ru/strings-action-keys.xml b/java/res/values-ru/strings-action-keys.xml index 331d28c6b..d5080ceb5 100644 --- a/java/res/values-ru/strings-action-keys.xml +++ b/java/res/values-ru/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Поиск"</string> - <string name="label_next_key" msgid="362972844525672568">"Далее"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Пред."</string> - <string name="label_done_key" msgid="2441578748772529288">"Готово"</string> - <string name="label_send_key" msgid="2815056534433717444">"Отправить"</string> - <string name="label_pause_key" msgid="181098308428035340">"Пауза"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Ждать"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"ОК"</string> + <string name="label_next_key" msgid="5586407279258592635">"Далее"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Назад"</string> + <string name="label_done_key" msgid="7564866296502630852">"Готово"</string> + <string name="label_send_key" msgid="482252074224462163">"Отправить"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Пауза"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Пауза"</string> </resources> diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml index 6db65e9ba..8bbaead0a 100644 --- a/java/res/values-ru/strings.xml +++ b/java/res/values-ru/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Латиница (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Латиница (ПК)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Эмодзи"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Цветовая гамма"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Белый"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Синий"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Персонализированные стили"</string> <string name="add_style" msgid="6163126614514489951">"Добавить стиль"</string> <string name="add" msgid="8299699805688017798">"Добавить"</string> diff --git a/java/res/values-sk/strings-action-keys.xml b/java/res/values-sk/strings-action-keys.xml index a646663d6..3586fb140 100644 --- a/java/res/values-sk/strings-action-keys.xml +++ b/java/res/values-sk/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Hľadať"</string> - <string name="label_next_key" msgid="362972844525672568">"Ďalej"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Pred."</string> - <string name="label_done_key" msgid="2441578748772529288">"Hotovo"</string> - <string name="label_send_key" msgid="2815056534433717444">"Odoslať"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pozastaviť"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Čakajte"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Ísť"</string> + <string name="label_next_key" msgid="5586407279258592635">"Ďalej"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Pred."</string> + <string name="label_done_key" msgid="7564866296502630852">"OK"</string> + <string name="label_send_key" msgid="482252074224462163">"Posl."</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pauza"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Čakať"</string> </resources> diff --git a/java/res/values-sk/strings.xml b/java/res/values-sk/strings.xml index 9e5de1e89..d1f966cea 100644 --- a/java/res/values-sk/strings.xml +++ b/java/res/values-sk/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Latinka (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Latinka (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Farebná schéma"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Biela"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Modrá"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Vlastné štýly vstupu"</string> <string name="add_style" msgid="6163126614514489951">"Pridať štýl"</string> <string name="add" msgid="8299699805688017798">"Pridať"</string> diff --git a/java/res/values-sl/strings-action-keys.xml b/java/res/values-sl/strings-action-keys.xml index 7e6c7787e..0235887af 100644 --- a/java/res/values-sl/strings-action-keys.xml +++ b/java/res/values-sl/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Pojdi"</string> - <string name="label_next_key" msgid="362972844525672568">"Naprej"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Nazaj"</string> - <string name="label_done_key" msgid="2441578748772529288">"Dokončano"</string> - <string name="label_send_key" msgid="2815056534433717444">"Pošlji"</string> - <string name="label_pause_key" msgid="181098308428035340">"Premor"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Čakaj"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Pojdi"</string> + <string name="label_next_key" msgid="5586407279258592635">"Napr."</string> + <string name="label_previous_key" msgid="1421141755779895275">"Prej."</string> + <string name="label_done_key" msgid="7564866296502630852">"Konec"</string> + <string name="label_send_key" msgid="482252074224462163">"Pošl."</string> + <string name="label_pause_key" msgid="2225922926459730642">"Zaus."</string> + <string name="label_wait_key" msgid="5891247853595466039">"Čakaj"</string> </resources> diff --git a/java/res/values-sl/strings.xml b/java/res/values-sl/strings.xml index 76e169b3e..a0f83c12f 100644 --- a/java/res/values-sl/strings.xml +++ b/java/res/values-sl/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Latinica (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Latinica (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Znaki »emoji«"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Barvna shema"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Bela"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Modra"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Slogi vnosa po meri"</string> <string name="add_style" msgid="6163126614514489951">"Dodaj slog"</string> <string name="add" msgid="8299699805688017798">"Dodaj"</string> diff --git a/java/res/values-sr/strings-action-keys.xml b/java/res/values-sr/strings-action-keys.xml index b1f0910bd..1ce0ed7fb 100644 --- a/java/res/values-sr/strings-action-keys.xml +++ b/java/res/values-sr/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Иди"</string> - <string name="label_next_key" msgid="362972844525672568">"Следеће"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Прет."</string> - <string name="label_done_key" msgid="2441578748772529288">"Готово"</string> - <string name="label_send_key" msgid="2815056534433717444">"Пошаљи"</string> - <string name="label_pause_key" msgid="181098308428035340">"Пауза"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Чекај"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Иди"</string> + <string name="label_next_key" msgid="5586407279258592635">"След"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Претх"</string> + <string name="label_done_key" msgid="7564866296502630852">"Готов"</string> + <string name="label_send_key" msgid="482252074224462163">"Шаљи"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Пауза"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Чекај"</string> </resources> diff --git a/java/res/values-sr/strings.xml b/java/res/values-sr/strings.xml index 16de76074..ce4978ff5 100644 --- a/java/res/values-sr/strings.xml +++ b/java/res/values-sr/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Абецеда (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Абецеда (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Емотикони"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Шема боја"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Бела"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Плава"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Прилаг. стилови уноса"</string> <string name="add_style" msgid="6163126614514489951">"Додав. стила"</string> <string name="add" msgid="8299699805688017798">"Додај"</string> diff --git a/java/res/values-sv/strings-action-keys.xml b/java/res/values-sv/strings-action-keys.xml index 4e59fa501..e13860811 100644 --- a/java/res/values-sv/strings-action-keys.xml +++ b/java/res/values-sv/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Kör"</string> - <string name="label_next_key" msgid="362972844525672568">"Nästa"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Föreg"</string> - <string name="label_done_key" msgid="2441578748772529288">"Färdig"</string> - <string name="label_send_key" msgid="2815056534433717444">"Skicka"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Vänta"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Kör"</string> + <string name="label_next_key" msgid="5586407279258592635">"Nästa"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Föreg"</string> + <string name="label_done_key" msgid="7564866296502630852">"Klart"</string> + <string name="label_send_key" msgid="482252074224462163">"Sänd"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pausa"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Vänta"</string> </resources> diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml index 32b8dbe22..afe349afd 100644 --- a/java/res/values-sv/strings.xml +++ b/java/res/values-sv/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alfabet (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alfabet (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Humörsymbol"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Färgschema"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Vit"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Blå"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Anpassade indatastilar"</string> <string name="add_style" msgid="6163126614514489951">"Ny stil"</string> <string name="add" msgid="8299699805688017798">"Lägg till"</string> diff --git a/java/res/values-sw/strings-action-keys.xml b/java/res/values-sw/strings-action-keys.xml index 55442534d..7d8822e80 100644 --- a/java/res/values-sw/strings-action-keys.xml +++ b/java/res/values-sw/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Nenda"</string> - <string name="label_next_key" msgid="362972844525672568">"Inayofuata"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Iliyotangulia"</string> - <string name="label_done_key" msgid="2441578748772529288">"Kwisha"</string> - <string name="label_send_key" msgid="2815056534433717444">"Tuma"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pumzisha"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Subiri"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Fanya"</string> + <string name="label_next_key" msgid="5586407279258592635">"Inayofuata"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Nyuma"</string> + <string name="label_done_key" msgid="7564866296502630852">"Imekamilika"</string> + <string name="label_send_key" msgid="482252074224462163">"Tuma"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Sitisha"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Subiri"</string> </resources> diff --git a/java/res/values-sw/strings.xml b/java/res/values-sw/strings.xml index f32fb7434..c88d68bd2 100644 --- a/java/res/values-sw/strings.xml +++ b/java/res/values-sw/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alfabeti (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alfabeti (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Mpangilio wa rangi"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Nyeupe"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Samawati"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Mitindo maalum ya ingizo"</string> <string name="add_style" msgid="6163126614514489951">"Ongeza mtindo"</string> <string name="add" msgid="8299699805688017798">"Ongeza"</string> diff --git a/java/res/values-sw540dp/config.xml b/java/res/values-sw540dp/config.xml index 926098800..ac992ea23 100644 --- a/java/res/values-sw540dp/config.xml +++ b/java/res/values-sw540dp/config.xml @@ -19,7 +19,6 @@ --> <resources> - <bool name="config_enable_show_voice_key_option">false</bool> <bool name="config_enable_show_option_of_key_preview_popup">false</bool> <!-- Whether or not Popup on key press is enabled by default --> <bool name="config_default_key_preview_popup">false</bool> diff --git a/java/res/layout/key_preview_klp.xml b/java/res/values-sw600dp/config.xml index 160aeb9a9..e72e4941e 100644 --- a/java/res/layout/key_preview_klp.xml +++ b/java/res/values-sw600dp/config.xml @@ -18,10 +18,6 @@ */ --> -<TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/keyboard_key_feedback_klp" - android:minWidth="32dp" - android:gravity="center" -/> +<resources> + <bool name="config_enable_show_voice_key_option">false</bool> +</resources> diff --git a/java/res/values-th/strings-action-keys.xml b/java/res/values-th/strings-action-keys.xml index 3fd9b4d31..f23bfbc2a 100644 --- a/java/res/values-th/strings-action-keys.xml +++ b/java/res/values-th/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"ไป"</string> - <string name="label_next_key" msgid="362972844525672568">"ถัดไป"</string> - <string name="label_previous_key" msgid="1211868118071386787">"ก่อนหน้า"</string> - <string name="label_done_key" msgid="2441578748772529288">"เสร็จสิ้น"</string> - <string name="label_send_key" msgid="2815056534433717444">"ส่ง"</string> - <string name="label_pause_key" msgid="181098308428035340">"หยุดชั่วคราว"</string> - <string name="label_wait_key" msgid="6402152600878093134">"รอ"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"เริ่ม"</string> + <string name="label_next_key" msgid="5586407279258592635">"ถัดไป"</string> + <string name="label_previous_key" msgid="1421141755779895275">"ก่อน"</string> + <string name="label_done_key" msgid="7564866296502630852">"เสร็จ"</string> + <string name="label_send_key" msgid="482252074224462163">"ส่ง"</string> + <string name="label_pause_key" msgid="2225922926459730642">"หยุด"</string> + <string name="label_wait_key" msgid="5891247853595466039">"รอ"</string> </resources> diff --git a/java/res/values-th/strings.xml b/java/res/values-th/strings.xml index d18d5c157..9249c05d5 100644 --- a/java/res/values-th/strings.xml +++ b/java/res/values-th/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"ตัวอักษร (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"ตัวอักษร (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"อีโมจิ"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"รูปแบบสี"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"ขาว"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"น้ำเงิน"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"รูปแบบอินพุตกำหนดเอง"</string> <string name="add_style" msgid="6163126614514489951">"เพิ่มสไตล์"</string> <string name="add" msgid="8299699805688017798">"เพิ่ม"</string> diff --git a/java/res/values-tl/strings-action-keys.xml b/java/res/values-tl/strings-action-keys.xml index 289c5e38a..a7f4cc78f 100644 --- a/java/res/values-tl/strings-action-keys.xml +++ b/java/res/values-tl/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Punta"</string> - <string name="label_next_key" msgid="362972844525672568">"Susunod"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Nkrn"</string> - <string name="label_done_key" msgid="2441578748772529288">"Tapos na"</string> - <string name="label_send_key" msgid="2815056534433717444">"Ipadala"</string> - <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Intay"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Go"</string> + <string name="label_next_key" msgid="5586407279258592635">"Sunod"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Nauna"</string> + <string name="label_done_key" msgid="7564866296502630852">"Tapos"</string> + <string name="label_send_key" msgid="482252074224462163">"Send"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Pause"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Intay"</string> </resources> diff --git a/java/res/values-tl/strings.xml b/java/res/values-tl/strings.xml index e6a0aa705..df6bda09b 100644 --- a/java/res/values-tl/strings.xml +++ b/java/res/values-tl/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alpabeto (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alpabeto (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Scheme ng kulay"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Puti"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Asul"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Custom style ng input"</string> <string name="add_style" msgid="6163126614514489951">"Dagdag style"</string> <string name="add" msgid="8299699805688017798">"Idagdag"</string> diff --git a/java/res/values-tr/strings-action-keys.xml b/java/res/values-tr/strings-action-keys.xml index b1b389aa8..b34c576b6 100644 --- a/java/res/values-tr/strings-action-keys.xml +++ b/java/res/values-tr/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Git"</string> - <string name="label_next_key" msgid="362972844525672568">"İleri"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Önceki"</string> - <string name="label_done_key" msgid="2441578748772529288">"Bitti"</string> - <string name="label_send_key" msgid="2815056534433717444">"Gönder"</string> - <string name="label_pause_key" msgid="181098308428035340">"Durkl"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Bekle"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Git"</string> + <string name="label_next_key" msgid="5586407279258592635">"İleri"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Geri"</string> + <string name="label_done_key" msgid="7564866296502630852">"Bitti"</string> + <string name="label_send_key" msgid="482252074224462163">"Gönder"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Dur"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Bekle"</string> </resources> diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml index e5d999688..a14295153 100644 --- a/java/res/values-tr/strings.xml +++ b/java/res/values-tr/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alfabe (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alfabe (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Renk şeması"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Beyaz"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Mavi"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Özel giriş stilleri"</string> <string name="add_style" msgid="6163126614514489951">"Stil ekle"</string> <string name="add" msgid="8299699805688017798">"Ekle"</string> diff --git a/java/res/values-uk/strings-action-keys.xml b/java/res/values-uk/strings-action-keys.xml index 97c30389e..3e5762b3f 100644 --- a/java/res/values-uk/strings-action-keys.xml +++ b/java/res/values-uk/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"OK"</string> - <string name="label_next_key" msgid="362972844525672568">"Далі"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Назад"</string> - <string name="label_done_key" msgid="2441578748772529288">"Готово"</string> - <string name="label_send_key" msgid="2815056534433717444">"Надісл."</string> - <string name="label_pause_key" msgid="181098308428035340">"Пауза"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Чек."</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Іти"</string> + <string name="label_next_key" msgid="5586407279258592635">"Далі"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Назад"</string> + <string name="label_done_key" msgid="7564866296502630852">"ОК"</string> + <string name="label_send_key" msgid="482252074224462163">"Слати"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Пауза"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Ждати"</string> </resources> diff --git a/java/res/values-uk/strings.xml b/java/res/values-uk/strings.xml index dc34ef58f..da26d5005 100644 --- a/java/res/values-uk/strings.xml +++ b/java/res/values-uk/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Латиниця (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Латиниця (ПК)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Cмайли Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Схема кольорів"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Біла"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Синя"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Персональні стилі введення"</string> <string name="add_style" msgid="6163126614514489951">"Додати стиль"</string> <string name="add" msgid="8299699805688017798">"Додати"</string> diff --git a/java/res/values-vi/strings-action-keys.xml b/java/res/values-vi/strings-action-keys.xml index 4cd7a9fea..ceb780ed1 100644 --- a/java/res/values-vi/strings-action-keys.xml +++ b/java/res/values-vi/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Tìm"</string> - <string name="label_next_key" msgid="362972844525672568">"Tiếp theo"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Trước"</string> - <string name="label_done_key" msgid="2441578748772529288">"Xong"</string> - <string name="label_send_key" msgid="2815056534433717444">"Gửi"</string> - <string name="label_pause_key" msgid="181098308428035340">"Tạm dừng"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Đợi"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Tìm"</string> + <string name="label_next_key" msgid="5586407279258592635">"Tiếp"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Trước"</string> + <string name="label_done_key" msgid="7564866296502630852">"Xong"</string> + <string name="label_send_key" msgid="482252074224462163">"Gửi"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Tdừng"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Đợi"</string> </resources> diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml index 5520a2e64..81cd373e4 100644 --- a/java/res/values-vi/strings.xml +++ b/java/res/values-vi/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Bảng chữ cái (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Bảng chữ cái (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Biểu tượng cảm xúc"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Phối màu"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Trắng"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Lam"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Kiểu nhập tùy chỉnh"</string> <string name="add_style" msgid="6163126614514489951">"Thêm kiểu"</string> <string name="add" msgid="8299699805688017798">"Thêm"</string> diff --git a/java/res/values-zh-rCN/strings-action-keys.xml b/java/res/values-zh-rCN/strings-action-keys.xml index af0472ee9..aacbb5fc7 100644 --- a/java/res/values-zh-rCN/strings-action-keys.xml +++ b/java/res/values-zh-rCN/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"开始"</string> - <string name="label_next_key" msgid="362972844525672568">"下个"</string> - <string name="label_previous_key" msgid="1211868118071386787">"后退"</string> - <string name="label_done_key" msgid="2441578748772529288">"完成"</string> - <string name="label_send_key" msgid="2815056534433717444">"发送"</string> - <string name="label_pause_key" msgid="181098308428035340">"暂停"</string> - <string name="label_wait_key" msgid="6402152600878093134">"等待"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"前往"</string> + <string name="label_next_key" msgid="5586407279258592635">"下个"</string> + <string name="label_previous_key" msgid="1421141755779895275">"上个"</string> + <string name="label_done_key" msgid="7564866296502630852">"完成"</string> + <string name="label_send_key" msgid="482252074224462163">"发送"</string> + <string name="label_pause_key" msgid="2225922926459730642">"暂停"</string> + <string name="label_wait_key" msgid="5891247853595466039">"等待"</string> </resources> diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml index a5a326c29..d347c9ce8 100644 --- a/java/res/values-zh-rCN/strings.xml +++ b/java/res/values-zh-rCN/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"字母 (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"字母 (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"表情符号"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"配色方案"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"白色"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"蓝色"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"自定义输入风格"</string> <string name="add_style" msgid="6163126614514489951">"添加样式"</string> <string name="add" msgid="8299699805688017798">"添加"</string> diff --git a/java/res/values-zh-rHK/strings-action-keys.xml b/java/res/values-zh-rHK/strings-action-keys.xml index 332519f0a..e95251696 100644 --- a/java/res/values-zh-rHK/strings-action-keys.xml +++ b/java/res/values-zh-rHK/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"開始"</string> - <string name="label_next_key" msgid="362972844525672568">"下一步"</string> - <string name="label_previous_key" msgid="1211868118071386787">"上一步"</string> - <string name="label_done_key" msgid="2441578748772529288">"完成"</string> - <string name="label_send_key" msgid="2815056534433717444">"發送"</string> - <string name="label_pause_key" msgid="181098308428035340">"暫停"</string> - <string name="label_wait_key" msgid="6402152600878093134">"等候"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"前往"</string> + <string name="label_next_key" msgid="5586407279258592635">"下一步"</string> + <string name="label_previous_key" msgid="1421141755779895275">"上一步"</string> + <string name="label_done_key" msgid="7564866296502630852">"完成"</string> + <string name="label_send_key" msgid="482252074224462163">"傳送"</string> + <string name="label_pause_key" msgid="2225922926459730642">"暫停"</string> + <string name="label_wait_key" msgid="5891247853595466039">"等候"</string> </resources> diff --git a/java/res/values-zh-rHK/strings.xml b/java/res/values-zh-rHK/strings.xml index ee833ce79..306045591 100644 --- a/java/res/values-zh-rHK/strings.xml +++ b/java/res/values-zh-rHK/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"字母 (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"字母 (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"色彩配置"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"白色"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"藍色"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"自訂輸入樣式"</string> <string name="add_style" msgid="6163126614514489951">"新增樣式"</string> <string name="add" msgid="8299699805688017798">"新增"</string> diff --git a/java/res/values-zh-rTW/strings-action-keys.xml b/java/res/values-zh-rTW/strings-action-keys.xml index 80045b08d..00daa5c63 100644 --- a/java/res/values-zh-rTW/strings-action-keys.xml +++ b/java/res/values-zh-rTW/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"前往"</string> - <string name="label_next_key" msgid="362972844525672568">"下一頁"</string> - <string name="label_previous_key" msgid="1211868118071386787">"上一頁"</string> - <string name="label_done_key" msgid="2441578748772529288">"完成"</string> - <string name="label_send_key" msgid="2815056534433717444">"傳送"</string> - <string name="label_pause_key" msgid="181098308428035340">"暫停"</string> - <string name="label_wait_key" msgid="6402152600878093134">"等待"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"執行"</string> + <string name="label_next_key" msgid="5586407279258592635">"繼續"</string> + <string name="label_previous_key" msgid="1421141755779895275">"返回"</string> + <string name="label_done_key" msgid="7564866296502630852">"完成"</string> + <string name="label_send_key" msgid="482252074224462163">"傳送"</string> + <string name="label_pause_key" msgid="2225922926459730642">"暫停"</string> + <string name="label_wait_key" msgid="5891247853595466039">"等待"</string> </resources> diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml index 21b2bec7e..2c474b79e 100644 --- a/java/res/values-zh-rTW/strings.xml +++ b/java/res/values-zh-rTW/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"字母 (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"字母 (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"表情符號"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"色彩配置"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"白色"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"藍色"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"自訂輸入樣式"</string> <string name="add_style" msgid="6163126614514489951">"新增樣式"</string> <string name="add" msgid="8299699805688017798">"新增"</string> diff --git a/java/res/values-zu/strings-action-keys.xml b/java/res/values-zu/strings-action-keys.xml index 054b4946c..6cd5e8c99 100644 --- a/java/res/values-zu/strings-action-keys.xml +++ b/java/res/values-zu/strings-action-keys.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- /* ** ** Copyright 2013, The Android Open Source Project @@ -16,14 +16,15 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> + --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="1635148082137219148">"Iya"</string> - <string name="label_next_key" msgid="362972844525672568">"Okulandelayo"</string> - <string name="label_previous_key" msgid="1211868118071386787">"Eledlule"</string> - <string name="label_done_key" msgid="2441578748772529288">"Kwenziwe"</string> - <string name="label_send_key" msgid="2815056534433717444">"Thumela"</string> - <string name="label_pause_key" msgid="181098308428035340">"Misa okwesikhashana"</string> - <string name="label_wait_key" msgid="6402152600878093134">"Linda"</string> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="label_go_key" msgid="4033615332628671065">"Hamba"</string> + <string name="label_next_key" msgid="5586407279258592635">"Okulandelayo"</string> + <string name="label_previous_key" msgid="1421141755779895275">"Okwedlule"</string> + <string name="label_done_key" msgid="7564866296502630852">"Kwenziwe"</string> + <string name="label_send_key" msgid="482252074224462163">"Thumela"</string> + <string name="label_pause_key" msgid="2225922926459730642">"Misa isikhashana"</string> + <string name="label_wait_key" msgid="5891247853595466039">"Linda"</string> </resources> diff --git a/java/res/values-zu/strings.xml b/java/res/values-zu/strings.xml index b8b753cde..27d11316c 100644 --- a/java/res/values-zu/strings.xml +++ b/java/res/values-zu/strings.xml @@ -147,6 +147,9 @@ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Alfabhethi (Colemak)"</string> <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Alfabhethi (PC)"</string> <string name="subtype_emoji" msgid="7483586578074549196">"I-Emoji"</string> + <string name="keyboard_color_scheme" msgid="9192934113872818070">"Isikimu sombala"</string> + <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Okumhlophe"</string> + <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Okuluhlaza okwesibhakabhaka"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Izitayela zokufaka ngokwezifiso"</string> <string name="add_style" msgid="6163126614514489951">"Engeza isitayela"</string> <string name="add" msgid="8299699805688017798">"Engeza"</string> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index a7425f1e7..11ab24481 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -26,14 +26,14 @@ <attr name="keyboardViewStyle" format="reference" /> <!-- MainKeyboardView style --> <attr name="mainKeyboardViewStyle" format="reference" /> + <!-- Key preview text view style --> + <attr name="keyPreviewTextViewStyle" format="reference"/> <!-- EmojiPalettesView style --> <attr name="emojiPalettesViewStyle" format="reference" /> <!-- MoreKeysKeyboard style --> <attr name="moreKeysKeyboardStyle" format="reference" /> <!-- MoreKeysKeyboardView style --> <attr name="moreKeysKeyboardViewStyle" format="reference" /> - <!-- MoreKeysKeyboardView container style --> - <attr name="moreKeysKeyboardContainerStyle" format="reference" /> <!-- Suggestions strip style --> <attr name="suggestionStripViewStyle" format="reference" /> <!-- Suggestion word style --> diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml index 298936d9c..75756ea7a 100644 --- a/java/res/values/themes-common.xml +++ b/java/res/values/themes-common.xml @@ -75,6 +75,7 @@ <item name="keyRepeatInterval">@integer/config_key_repeat_interval</item> <item name="longPressShiftLockTimeout">@integer/config_longpress_shift_lock_timeout</item> <item name="ignoreAltCodeKeyTimeout">@integer/config_ignore_alt_code_key_timeout</item> + <item name="keyPreviewLayout">@layout/key_preview</item> <item name="keyPreviewHeight">@dimen/key_preview_height</item> <item name="keyPreviewLingerTimeout">@integer/config_key_preview_linger_timeout</item> <item name="moreKeysKeyboardLayout">@layout/more_keys_keyboard</item> @@ -104,6 +105,7 @@ <style name="MainKeyboardView" parent="KeyboardView" /> + <style name="KeyPreviewTextView" /> <!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it, for instance delete button, need themed {@link KeyboardView} attributes. --> <style diff --git a/java/res/values/themes-gb.xml b/java/res/values/themes-gb.xml index f52695f55..34075e70a 100644 --- a/java/res/values/themes-gb.xml +++ b/java/res/values/themes-gb.xml @@ -23,10 +23,10 @@ <item name="keyboardStyle">@style/Keyboard.GB</item> <item name="keyboardViewStyle">@style/KeyboardView.GB</item> <item name="mainKeyboardViewStyle">@style/MainKeyboardView.GB</item> + <item name="keyPreviewTextViewStyle">@style/KeyPreviewTextView.GB</item> <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.GB</item> <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.GB</item> <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.GB</item> - <item name="moreKeysKeyboardContainerStyle">@style/MoreKeysKeyboardContainer.GB</item> <item name="suggestionStripViewStyle">@style/SuggestionStripView.GB</item> <item name="suggestionWordStyle">@style/SuggestionWord.GB</item> </style> @@ -85,7 +85,6 @@ name="MainKeyboardView.GB" parent="KeyboardView.GB" > - <item name="keyPreviewLayout">@layout/key_preview_gb</item> <item name="keyPreviewOffset">@dimen/key_preview_offset_gb</item> <item name="gestureFloatingPreviewTextColor">@color/highlight_color_gb</item> <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_gb</item> @@ -96,6 +95,12 @@ <item name="spacebarTextColor">@color/spacebar_text_color_gb</item> <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_gb</item> </style> + <style + name="KeyPreviewTextView.GB" + parent="KeyPreviewTextView" + > + <item name="android:background">@drawable/keyboard_key_feedback_gb</item> + </style> <!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it, for instance delete button, need themed {@link KeyboardView} attributes. --> <style @@ -118,17 +123,12 @@ name="MoreKeysKeyboardView.GB" parent="KeyboardView.GB" > - <item name="android:background">@null</item> + <item name="android:background">@drawable/keyboard_popup_panel_background_gb</item> <item name="keyBackground">@drawable/btn_keyboard_key_popup_gb</item> <item name="keyTypeface">normal</item> <item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_gb</item> </style> <style - name="MoreKeysKeyboardContainer.GB" - > - <item name="android:background">@drawable/keyboard_popup_panel_background_gb</item> - </style> - <style name="SuggestionStripView.GB" parent="SuggestionStripView" > diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml index 432ad5122..b4f5af4f1 100644 --- a/java/res/values/themes-ics.xml +++ b/java/res/values/themes-ics.xml @@ -23,10 +23,10 @@ <item name="keyboardStyle">@style/Keyboard.ICS</item> <item name="keyboardViewStyle">@style/KeyboardView.ICS</item> <item name="mainKeyboardViewStyle">@style/MainKeyboardView.ICS</item> + <item name="keyPreviewTextViewStyle">@style/KeyPreviewTextView.ICS</item> <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.ICS</item> <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.ICS</item> <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.ICS</item> - <item name="moreKeysKeyboardContainerStyle">@style/MoreKeysKeyboardContainer.ICS</item> <item name="suggestionStripViewStyle">@style/SuggestionStripView.ICS</item> <item name="suggestionWordStyle">@style/SuggestionWord.ICS</item> </style> @@ -63,7 +63,6 @@ name="MainKeyboardView.ICS" parent="KeyboardView.ICS" > - <item name="keyPreviewLayout">@layout/key_preview_ics</item> <item name="keyPreviewOffset">@dimen/key_preview_offset_holo</item> <item name="gestureFloatingPreviewTextColor">@color/highlight_color_ics</item> <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item> @@ -74,6 +73,12 @@ <item name="spacebarTextColor">@color/spacebar_text_color_holo</item> <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item> </style> + <style + name="KeyPreviewTextView.ICS" + parent="KeyPreviewTextView" + > + <item name="android:background">@drawable/keyboard_key_feedback_ics</item> + </style> <!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it, for instance delete button, need themed {@link KeyboardView} attributes. --> <style @@ -96,17 +101,12 @@ name="MoreKeysKeyboardView.ICS" parent="KeyboardView.ICS" > - <item name="android:background">@null</item> + <item name="android:background">@drawable/keyboard_popup_panel_background_ics</item> <item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item> <item name="keyTypeface">normal</item> <item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_holo</item> </style> <style - name="MoreKeysKeyboardContainer.ICS" - > - <item name="android:background">@drawable/keyboard_popup_panel_background_ics</item> - </style> - <style name="SuggestionStripView.ICS" parent="SuggestionStripView" > diff --git a/java/res/values/themes-klp.xml b/java/res/values/themes-klp.xml index a3730019d..ef88d8850 100644 --- a/java/res/values/themes-klp.xml +++ b/java/res/values/themes-klp.xml @@ -23,10 +23,10 @@ <item name="keyboardStyle">@style/Keyboard.KLP</item> <item name="keyboardViewStyle">@style/KeyboardView.KLP</item> <item name="mainKeyboardViewStyle">@style/MainKeyboardView.KLP</item> + <item name="keyPreviewTextViewStyle">@style/KeyPreviewTextView.KLP</item> <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.KLP</item> <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.KLP</item> <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.KLP</item> - <item name="moreKeysKeyboardContainerStyle">@style/MoreKeysKeyboardContainer.KLP</item> <item name="suggestionStripViewStyle">@style/SuggestionStripView.KLP</item> <item name="suggestionWordStyle">@style/SuggestionWord.KLP</item> </style> @@ -63,7 +63,6 @@ name="MainKeyboardView.KLP" parent="KeyboardView.KLP" > - <item name="keyPreviewLayout">@layout/key_preview_klp</item> <item name="keyPreviewOffset">@dimen/key_preview_offset_holo</item> <item name="gestureFloatingPreviewTextColor">@color/highlight_color_klp</item> <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item> @@ -74,6 +73,12 @@ <item name="spacebarTextColor">@color/spacebar_text_color_holo</item> <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item> </style> + <style + name="KeyPreviewTextView.KLP" + parent="KeyPreviewTextView" + > + <item name="android:background">@drawable/keyboard_key_feedback_klp</item> + </style> <!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it, for instance delete button, need themed {@link KeyboardView} attributes. --> <style @@ -96,17 +101,12 @@ name="MoreKeysKeyboardView.KLP" parent="KeyboardView.KLP" > - <item name="android:background">@null</item> + <item name="android:background">@drawable/keyboard_popup_panel_background_klp</item> <item name="keyBackground">@drawable/btn_keyboard_key_popup_klp</item> <item name="keyTypeface">normal</item> <item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_holo</item> </style> <style - name="MoreKeysKeyboardContainer.KLP" - > - <item name="android:background">@drawable/keyboard_popup_panel_background_klp</item> - </style> - <style name="SuggestionStripView.KLP" parent="SuggestionStripView" > diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_for_debug.xml index 8d9508e38..124c44388 100644 --- a/java/res/xml/prefs_for_debug.xml +++ b/java/res/xml/prefs_for_debug.xml @@ -58,6 +58,12 @@ android:persistent="true" android:title="@string/prefs_use_only_personalization_dictionary" /> + <CheckBoxPreference + android:defaultValue="false" + android:key="boost_personalization_dictionary_for_debug" + android:persistent="true" + android:title="@string/prefs_boost_personalization_dictionary" /> + <PreferenceScreen android:key="read_external_dictionary" android:title="@string/prefs_read_external_dictionary" /> diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java index a638b238c..9ba46202a 100644 --- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java @@ -34,7 +34,6 @@ import android.preference.PreferenceManager; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.Log; -import android.util.SparseArray; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -71,6 +70,9 @@ import com.android.inputmethod.latin.utils.UsabilityStudyLogUtils; import com.android.inputmethod.latin.utils.ViewLayoutUtils; import com.android.inputmethod.research.ResearchLogger; +import java.util.ArrayDeque; +import java.util.HashMap; +import java.util.HashSet; import java.util.WeakHashMap; /** @@ -158,7 +160,10 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack private final int mKeyPreviewLayoutId; private final int mKeyPreviewOffset; private final int mKeyPreviewHeight; - private final SparseArray<TextView> mKeyPreviewTexts = CollectionUtils.newSparseArray(); + // Free {@link TextView} pool that can be used for key preview. + private final ArrayDeque<TextView> mFreeKeyPreviewTextViews = CollectionUtils.newArrayDeque(); + // Map from {@link Key} to {@link TextView} that is currently being displayed as key preview. + private final HashMap<Key,TextView> mShowingKeyPreviewTextViews = CollectionUtils.newHashMap(); private final KeyPreviewDrawParams mKeyPreviewDrawParams = new KeyPreviewDrawParams(); private boolean mShowKeyPreviewPopup = true; private int mKeyPreviewLingerTimeout; @@ -381,13 +386,18 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack public void handleMessage(final Message msg) { final MainKeyboardView mainKeyboardView = getOuterInstance(); if (mainKeyboardView == null) return; - final PointerTracker tracker = (PointerTracker) msg.obj; switch (msg.what) { case MSG_DISMISS_KEY_PREVIEW: - final TextView previewText = mainKeyboardView.mKeyPreviewTexts.get( - tracker.mPointerId); - if (previewText != null) { - previewText.setVisibility(INVISIBLE); + final Key key = (Key)msg.obj; + if (key != null) { + final TextView previewTextView = + mainKeyboardView.mShowingKeyPreviewTextViews.remove(key); + if (previewTextView != null) { + previewTextView.setVisibility(INVISIBLE); + mainKeyboardView.mFreeKeyPreviewTextViews.add(previewTextView); + } + // To redraw key top letter. + mainKeyboardView.invalidateKey(key); } break; case MSG_DISMISS_GESTURE_FLOATING_PREVIEW_TEXT: @@ -396,12 +406,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack } } - public void dismissKeyPreview(final long delay, final PointerTracker tracker) { - sendMessageDelayed(obtainMessage(MSG_DISMISS_KEY_PREVIEW, tracker), delay); - } - - public void cancelDismissKeyPreview(final PointerTracker tracker) { - removeMessages(MSG_DISMISS_KEY_PREVIEW, tracker); + public void dismissKeyPreview(final long delay, final Key key) { + sendMessageDelayed(obtainMessage(MSG_DISMISS_KEY_PREVIEW, key), delay); } private void cancelAllDismissKeyPreviews() { @@ -681,33 +687,34 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack return mShowKeyPreviewPopup; } - private void addKeyPreview(final TextView keyPreview) { - locatePreviewPlacerView(); - mPreviewPlacerView.addView( - keyPreview, ViewLayoutUtils.newLayoutParam(mPreviewPlacerView, 0, 0)); - } - - private TextView getKeyPreviewText(final int pointerId) { - TextView previewText = mKeyPreviewTexts.get(pointerId); - if (previewText != null) { - return previewText; + private TextView getKeyPreviewTextView(final Key key) { + TextView previewTextView = mShowingKeyPreviewTextViews.remove(key); + if (previewTextView != null) { + return previewTextView; + } + previewTextView = mFreeKeyPreviewTextViews.poll(); + if (previewTextView != null) { + return previewTextView; } final Context context = getContext(); if (mKeyPreviewLayoutId != 0) { - previewText = (TextView)LayoutInflater.from(context).inflate(mKeyPreviewLayoutId, null); + previewTextView = (TextView)LayoutInflater.from(context) + .inflate(mKeyPreviewLayoutId, null); } else { - previewText = new TextView(context); + previewTextView = new TextView(context); } - mKeyPreviewTexts.put(pointerId, previewText); - return previewText; + locatePreviewPlacerView(); + mPreviewPlacerView.addView( + previewTextView, ViewLayoutUtils.newLayoutParam(mPreviewPlacerView, 0, 0)); + return previewTextView; } private void dismissAllKeyPreviews() { - final int pointerCount = mKeyPreviewTexts.size(); - for (int id = 0; id < pointerCount; id++) { - final TextView previewText = mKeyPreviewTexts.get(id); - if (previewText != null) { - previewText.setVisibility(INVISIBLE); + for (final Key key : new HashSet<Key>(mShowingKeyPreviewTextViews.keySet())) { + final TextView previewTextView = mShowingKeyPreviewTextViews.remove(key); + if (previewTextView != null) { + previewTextView.setVisibility(INVISIBLE); + mFreeKeyPreviewTextViews.add(previewTextView); } } PointerTracker.setReleasedKeyGraphicsToAllKeys(); @@ -735,23 +742,7 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack private static final int STATE_HAS_MOREKEYS = 1; @Override - public void showKeyPreview(final PointerTracker tracker) { - final KeyPreviewDrawParams previewParams = mKeyPreviewDrawParams; - final Keyboard keyboard = getKeyboard(); - if (!mShowKeyPreviewPopup) { - previewParams.mPreviewVisibleOffset = -keyboard.mVerticalGap; - return; - } - - final TextView previewText = getKeyPreviewText(tracker.mPointerId); - // If the key preview has no parent view yet, add it to the ViewGroup which can place - // key preview absolutely in SoftInputWindow. - if (previewText.getParent() == null) { - addKeyPreview(previewText); - } - - mDrawingHandler.cancelDismissKeyPreview(tracker); - final Key key = tracker.getKey(); + public void showKeyPreview(final Key key) { // If key is invalid or IME is already closed, we must not show key preview. // Trying to show key preview while root window is closed causes // WindowManager.BadTokenException. @@ -759,38 +750,47 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack return; } + final KeyPreviewDrawParams previewParams = mKeyPreviewDrawParams; + final Keyboard keyboard = getKeyboard(); + if (!mShowKeyPreviewPopup) { + previewParams.mPreviewVisibleOffset = -keyboard.mVerticalGap; + return; + } + + final TextView previewTextView = getKeyPreviewTextView(key); final KeyDrawParams drawParams = mKeyDrawParams; - previewText.setTextColor(drawParams.mPreviewTextColor); - final Drawable background = previewText.getBackground(); + previewTextView.setTextColor(drawParams.mPreviewTextColor); + final Drawable background = previewTextView.getBackground(); final String label = key.getPreviewLabel(); // What we show as preview should match what we show on a key top in onDraw(). if (label != null) { // TODO Should take care of temporaryShiftLabel here. - previewText.setCompoundDrawables(null, null, null, null); - previewText.setTextSize(TypedValue.COMPLEX_UNIT_PX, + previewTextView.setCompoundDrawables(null, null, null, null); + previewTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, key.selectPreviewTextSize(drawParams)); - previewText.setTypeface(key.selectPreviewTypeface(drawParams)); - previewText.setText(label); + previewTextView.setTypeface(key.selectPreviewTypeface(drawParams)); + previewTextView.setText(label); } else { - previewText.setCompoundDrawables(null, null, null, + previewTextView.setCompoundDrawables(null, null, null, key.getPreviewIcon(keyboard.mIconsSet)); - previewText.setText(null); + previewTextView.setText(null); } - previewText.measure( + previewTextView.measure( ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); final int keyDrawWidth = key.getDrawWidth(); - final int previewWidth = previewText.getMeasuredWidth(); + final int previewWidth = previewTextView.getMeasuredWidth(); final int previewHeight = mKeyPreviewHeight; // The width and height of visible part of the key preview background. The content marker // of the background 9-patch have to cover the visible part of the background. - previewParams.mPreviewVisibleWidth = previewWidth - previewText.getPaddingLeft() - - previewText.getPaddingRight(); - previewParams.mPreviewVisibleHeight = previewHeight - previewText.getPaddingTop() - - previewText.getPaddingBottom(); + previewParams.mPreviewVisibleWidth = previewWidth - previewTextView.getPaddingLeft() + - previewTextView.getPaddingRight(); + previewParams.mPreviewVisibleHeight = previewHeight - previewTextView.getPaddingTop() + - previewTextView.getPaddingBottom(); // The distance between the top edge of the parent key and the bottom of the visible part // of the key preview background. - previewParams.mPreviewVisibleOffset = mKeyPreviewOffset - previewText.getPaddingBottom(); + previewParams.mPreviewVisibleOffset = + mKeyPreviewOffset - previewTextView.getPaddingBottom(); getLocationInWindow(mOriginCoords); // The key preview is horizontally aligned with the center of the visible part of the // parent key. If it doesn't fit in this {@link KeyboardView}, it is moved inward to fit and @@ -817,13 +817,14 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack background.setState(KEY_PREVIEW_BACKGROUND_STATE_TABLE[statePosition][hasMoreKeys]); } ViewLayoutUtils.placeViewAt( - previewText, previewX, previewY, previewWidth, previewHeight); - previewText.setVisibility(VISIBLE); + previewTextView, previewX, previewY, previewWidth, previewHeight); + previewTextView.setVisibility(VISIBLE); + mShowingKeyPreviewTextViews.put(key, previewTextView); } @Override - public void dismissKeyPreview(final PointerTracker tracker) { - mDrawingHandler.dismissKeyPreview(mKeyPreviewLingerTimeout, tracker); + public void dismissKeyPreview(final Key key) { + mDrawingHandler.dismissKeyPreview(mKeyPreviewLingerTimeout, key); } public void setSlidingKeyInputPreviewEnabled(final boolean enabled) { @@ -1175,6 +1176,12 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack if (key.altCodeWhileTyping() && key.isEnabled()) { params.mAnimAlpha = mAltCodeKeyWhileTypingAnimAlpha; } + // Don't draw key top letter when key preview is showing. + if (mShowingKeyPreviewTextViews.containsKey(key)) { + // TODO: Fade out animation for the key top letter, and fade in animation for the key + // background color when the user presses the key. + return; + } final int code = key.getCode(); if (code == Constants.CODE_SPACE) { drawSpacebar(key, canvas, paint); diff --git a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java index 385123998..fca727b29 100644 --- a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java +++ b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java @@ -223,7 +223,7 @@ public final class MoreKeysKeyboard extends Keyboard { } public int getDefaultKeyCoordX() { - return mLeftKeys * mColumnWidth; + return mLeftKeys * mColumnWidth + mLeftPadding; } public int getX(final int n, final int row) { diff --git a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java index 973128d36..8492d9385 100644 --- a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java @@ -81,11 +81,13 @@ public class MoreKeysKeyboardView extends KeyboardView implements MoreKeysPanel mListener = listener; final View container = getContainerView(); // The coordinates of panel's left-top corner in parentView's coordinate system. - final int x = pointX - getDefaultCoordX() - container.getPaddingLeft(); - final int y = pointY - container.getMeasuredHeight() + container.getPaddingBottom(); + // We need to consider background drawable paddings. + final int x = pointX - getDefaultCoordX() - container.getPaddingLeft() - getPaddingLeft(); + final int y = pointY - container.getMeasuredHeight() + container.getPaddingBottom() + + getPaddingBottom(); parentView.getLocationInWindow(mCoordinates); - // Ensure the horizontal position of the panel does not extend past the screen edges. + // Ensure the horizontal position of the panel does not extend past the parentView edges. final int maxX = parentView.getMeasuredWidth() - container.getMeasuredWidth(); final int panelX = Math.max(0, Math.min(maxX, x)) + CoordinateUtils.x(mCoordinates); final int panelY = y + CoordinateUtils.y(mCoordinates); diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java index 52f190e77..8860ed32a 100644 --- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java +++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java @@ -84,8 +84,8 @@ public final class PointerTracker implements PointerTrackerQueue.Element { public interface DrawingProxy { public void invalidateKey(Key key); - public void showKeyPreview(PointerTracker tracker); - public void dismissKeyPreview(PointerTracker tracker); + public void showKeyPreview(Key key); + public void dismissKeyPreview(Key key); public void showSlidingKeyInputPreview(PointerTracker tracker); public void dismissSlidingKeyInputPreview(); public void showGestureTrail(PointerTracker tracker, boolean showsFloatingPreviewText); @@ -637,7 +637,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { } private void setReleasedKeyGraphics(final Key key) { - mDrawingProxy.dismissKeyPreview(this); + mDrawingProxy.dismissKeyPreview(key); if (key == null) { return; } @@ -685,7 +685,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { } if (!key.noKeyPreview() && !sInGesture && !needsToSuppressKeyPreviewPopup(eventTime)) { - mDrawingProxy.showKeyPreview(this); + mDrawingProxy.showKeyPreview(key); } updatePressKeyGraphics(key); diff --git a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java index 47891c6b7..366f3d4fe 100644 --- a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java @@ -44,7 +44,8 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary { private static final String TAG = ContactsBinaryDictionary.class.getSimpleName(); private static final String NAME = "contacts"; - private static boolean DEBUG = false; + private static final boolean DEBUG = false; + private static final boolean DEBUG_DUMP = false; /** * Frequency for contacts information into the dictionary @@ -168,6 +169,10 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary { if (isValidName(name)) { addName(name); ++count; + } else { + if (DEBUG_DUMP) { + Log.d(TAG, "Invalid name: " + name); + } } cursor.moveToNext(); } @@ -204,6 +209,9 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary { if (Character.isLetter(name.codePointAt(i))) { int end = getWordEndPosition(name, len, i); String word = name.substring(i, end); + if (DEBUG_DUMP) { + Log.d(TAG, "addName word = " + word); + } i = end - 1; // Don't add single letter words, possibly confuses // capitalization of i. diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java index d059cc8a9..a0e4e5472 100644 --- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java @@ -288,7 +288,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary { private void runGCIfRequiredInternalLocked(final boolean mindsBlockByGC) { // Calls to needsToRunGC() need to be serialized. if (mBinaryDictionary.needsToRunGC(mindsBlockByGC)) { - if (setIsRegeneratingIfNotRegenerating()) { + if (setProcessingLargeTaskIfNot()) { // Run GC after currently existing time sensitive operations. getExecutor(mFilename).executePrioritized(new Runnable() { @Override @@ -296,7 +296,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary { try { mBinaryDictionary.flushWithGC(); } finally { - mFilenameDictionaryUpdateController.mIsRegenerating.set(false); + mFilenameDictionaryUpdateController.mProcessingLargeTask.set(false); } } }); @@ -359,13 +359,76 @@ abstract public class ExpandableBinaryDictionary extends Dictionary { }); } + public interface AddMultipleDictionaryEntriesCallback { + public void onFinished(); + } + + public static class LanguageModelParam { + public final String mWord0; + public final String mWord1; + public final boolean mIsValid; + public final int mFrequency; + public final int mBigramFrequency; + public LanguageModelParam(final String word0, final String word1, final boolean isValid, + final int frequency, final int bigramFrequency) { + mWord0 = word0; + mWord1 = word1; + mIsValid = isValid; + mFrequency = frequency; + mBigramFrequency = bigramFrequency; + } + } + + /** + * Dynamically add multiple entries to the dictionary. + */ + protected void addMultipleDictionaryEntriesDynamically( + final ArrayList<LanguageModelParam> languageModelParams, + final AddMultipleDictionaryEntriesCallback callback) { + if (!mIsUpdatable) { + Log.w(TAG, "addMultipleDictionaryEntriesDynamically is called for non-updatable " + + "dictionary: " + mFilename); + return; + } + getExecutor(mFilename).execute(new Runnable() { + @Override + public void run() { + final boolean locked = setProcessingLargeTaskIfNot(); + try { + for (final LanguageModelParam languageModelParam : languageModelParams) { + if (languageModelParam.mWord1 == null) { + continue; + } + if (mBinaryDictionary.needsToRunGC(true /* mindsBlockByGC */)) { + mBinaryDictionary.flushWithGC(); + } + mBinaryDictionary.addUnigramWord(languageModelParam.mWord1, + languageModelParam.mFrequency); + if (languageModelParam.mWord0 != null + && !languageModelParam.mWord0.equals(languageModelParam.mWord1)) { + mBinaryDictionary.addBigramWords(languageModelParam.mWord0, + languageModelParam.mWord1, languageModelParam.mBigramFrequency); + } + } + } finally { + if (callback != null) { + callback.onFinished(); + } + if (locked) { + mFilenameDictionaryUpdateController.mProcessingLargeTask.set(false); + } + } + } + }); + } + @Override public ArrayList<SuggestedWordInfo> getSuggestionsWithSessionId(final WordComposer composer, final String prevWord, final ProximityInfo proximityInfo, final boolean blockOffensiveWords, final int[] additionalFeaturesOptions, final int sessionId) { reloadDictionaryIfRequired(); - if (isRegenerating()) { + if (processingLargeTask()) { return null; } final AsyncResultHolder<ArrayList<SuggestedWordInfo>> holder = @@ -402,7 +465,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary { } protected boolean isValidWordInner(final String word) { - if (isRegenerating()) { + if (processingLargeTask()) { return false; } final AsyncResultHolder<Boolean> holder = new AsyncResultHolder<Boolean>(); @@ -524,7 +587,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary { */ public final void reloadDictionaryIfRequired() { if (!isReloadRequired()) return; - if (setIsRegeneratingIfNotRegenerating()) { + if (setProcessingLargeTaskIfNot()) { reloadDictionary(); } } @@ -536,13 +599,14 @@ abstract public class ExpandableBinaryDictionary extends Dictionary { return mBinaryDictionary == null || mPerInstanceDictionaryUpdateController.isOutOfDate(); } - private boolean isRegenerating() { - return mFilenameDictionaryUpdateController.mIsRegenerating.get(); + private boolean processingLargeTask() { + return mFilenameDictionaryUpdateController.mProcessingLargeTask.get(); } - // Returns whether the dictionary can be regenerated. - private boolean setIsRegeneratingIfNotRegenerating() { - return mFilenameDictionaryUpdateController.mIsRegenerating.compareAndSet( + // Returns whether the dictionary is being used for a large task. If true, we should not use + // this dictionary for latency sensitive operations. + private boolean setProcessingLargeTaskIfNot() { + return mFilenameDictionaryUpdateController.mProcessingLargeTask.compareAndSet( false /* expect */ , true /* update */); } @@ -592,7 +656,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary { } mPerInstanceDictionaryUpdateController.mLastUpdateTime = time; } finally { - mFilenameDictionaryUpdateController.mIsRegenerating.set(false); + mFilenameDictionaryUpdateController.mProcessingLargeTask.set(false); } } }); @@ -619,13 +683,13 @@ abstract public class ExpandableBinaryDictionary extends Dictionary { } /** - * For tracking whether the dictionary is out of date and the dictionary is regenerating. - * Can be shared across multiple dictionary instances that access the same filename. + * For tracking whether the dictionary is out of date and the dictionary is used in a large + * task. Can be shared across multiple dictionary instances that access the same filename. */ private static class DictionaryUpdateController { public volatile long mLastUpdateTime = 0; public volatile long mLastUpdateRequestTime = 0; - public volatile AtomicBoolean mIsRegenerating = new AtomicBoolean(); + public volatile AtomicBoolean mProcessingLargeTask = new AtomicBoolean(); public boolean isOutOfDate() { return (mLastUpdateRequestTime > mLastUpdateTime); @@ -666,7 +730,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary { mBinaryDictionary.flushWithGC(); r.run(); } finally { - mFilenameDictionaryUpdateController.mIsRegenerating.set(false); + mFilenameDictionaryUpdateController.mProcessingLargeTask.set(false); } } }); diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java index 0a4c7a55d..53f04b118 100644 --- a/java/src/com/android/inputmethod/latin/Suggest.java +++ b/java/src/com/android/inputmethod/latin/Suggest.java @@ -432,7 +432,8 @@ public final class Suggest { final String scoreInfoString; if (normalizedScore > 0) { scoreInfoString = String.format( - Locale.ROOT, "%d (%4.2f)", cur.mScore, normalizedScore); + Locale.ROOT, "%d (%4.2f), %s", cur.mScore, normalizedScore, + cur.mSourceDict.mDictType); } else { scoreInfoString = Integer.toString(cur.mScore); } diff --git a/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java b/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java index 8d14e4d60..62d9ad86d 100644 --- a/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java +++ b/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java @@ -429,7 +429,9 @@ public final class BinaryDictIOUtils { if (countSize != 1 && countSize != 2) { throw new RuntimeException("Strange size from getPtNodeCountSize : " + countSize); } - BinaryDictEncoderUtils.writeUIntToStream(destination, ptNodeCount, countSize); + final int encodedPtNodeCount = (countSize == 2) ? + (ptNodeCount | FormatSpec.LARGE_PTNODE_ARRAY_SIZE_FIELD_SIZE_FLAG) : ptNodeCount; + BinaryDictEncoderUtils.writeUIntToStream(destination, encodedPtNodeCount, countSize); return countSize; } diff --git a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java b/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java index 5aee135ad..f85431ee8 100644 --- a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java +++ b/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java @@ -304,6 +304,8 @@ public final class FormatSpec { static final int INVALID_CHARACTER = -1; static final int MAX_PTNODES_FOR_ONE_BYTE_PTNODE_COUNT = 0x7F; // 127 + // Large PtNode array size field size is 2 bytes. + static final int LARGE_PTNODE_ARRAY_SIZE_FIELD_SIZE_FLAG = 0x8000; static final int MAX_PTNODES_IN_A_PT_NODE_ARRAY = 0x7FFF; // 32767 static final int MAX_BIGRAMS_IN_A_PTNODE = 10000; static final int MAX_SHORTCUT_LIST_SIZE_IN_A_PTNODE = 0xFFFF; diff --git a/java/src/com/android/inputmethod/latin/makedict/Ver3DictEncoder.java b/java/src/com/android/inputmethod/latin/makedict/Ver3DictEncoder.java index d9e19899c..5da34534e 100644 --- a/java/src/com/android/inputmethod/latin/makedict/Ver3DictEncoder.java +++ b/java/src/com/android/inputmethod/latin/makedict/Ver3DictEncoder.java @@ -129,7 +129,9 @@ public class Ver3DictEncoder implements DictEncoder { if (countSize != 1 && countSize != 2) { throw new RuntimeException("Strange size from getGroupCountSize : " + countSize); } - mPosition = BinaryDictEncoderUtils.writeUIntToBuffer(mBuffer, mPosition, ptNodeCount, + final int encodedPtNodeCount = (countSize == 2) ? + (ptNodeCount | FormatSpec.LARGE_PTNODE_ARRAY_SIZE_FIELD_SIZE_FLAG) : ptNodeCount; + mPosition = BinaryDictEncoderUtils.writeUIntToBuffer(mBuffer, mPosition, encodedPtNodeCount, countSize); } diff --git a/java/src/com/android/inputmethod/latin/makedict/Ver4DictEncoder.java b/java/src/com/android/inputmethod/latin/makedict/Ver4DictEncoder.java index 4b3acdc8e..772b09be0 100644 --- a/java/src/com/android/inputmethod/latin/makedict/Ver4DictEncoder.java +++ b/java/src/com/android/inputmethod/latin/makedict/Ver4DictEncoder.java @@ -320,7 +320,9 @@ public class Ver4DictEncoder implements DictEncoder { if (countSize != 1 && countSize != 2) { throw new RuntimeException("Strange size from getPtNodeCountSize : " + countSize); } - mTriePos = BinaryDictEncoderUtils.writeUIntToBuffer(mTrieBuf, mTriePos, ptNodeCount, + final int encodedPtNodeCount = (countSize == 2) ? + (ptNodeCount | FormatSpec.LARGE_PTNODE_ARRAY_SIZE_FIELD_SIZE_FLAG) : ptNodeCount; + mTriePos = BinaryDictEncoderUtils.writeUIntToBuffer(mTrieBuf, mTriePos, encodedPtNodeCount, countSize); } diff --git a/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java b/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java index e7a25d216..42bd7600e 100644 --- a/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java +++ b/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java @@ -113,6 +113,18 @@ public abstract class DecayingExpandableBinaryDictionaryBase extends ExpandableB return false; } + public void addMultipleDictionaryEntriesToDictionary( + final ArrayList<LanguageModelParam> languageModelParams, + final ExpandableBinaryDictionary.AddMultipleDictionaryEntriesCallback callback) { + if (languageModelParams == null || languageModelParams.isEmpty()) { + if (callback != null) { + callback.onFinished(); + } + return; + } + addMultipleDictionaryEntriesDynamically(languageModelParams, callback); + } + /** * Pair will be added to the decaying dictionary. * diff --git a/java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionaryUpdateSession.java b/java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionaryUpdateSession.java index a86f6e584..1f46f5b1c 100644 --- a/java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionaryUpdateSession.java +++ b/java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionaryUpdateSession.java @@ -18,6 +18,8 @@ package com.android.inputmethod.latin.personalization; import android.content.Context; +import com.android.inputmethod.latin.ExpandableBinaryDictionary; + import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -113,6 +115,20 @@ public abstract class PersonalizationDictionaryUpdateSession { dictionary.addToDictionary(word0, word1, isValid); } + // TODO: Support multi locale. + public void addMultipleDictionaryEntriesToPersonalizationDictionary( + final ArrayList<ExpandableBinaryDictionary.LanguageModelParam> languageModelParams, + final ExpandableBinaryDictionary.AddMultipleDictionaryEntriesCallback callback) { + final DecayingExpandableBinaryDictionaryBase dictionary = getPredictionDictionary(); + if (dictionary == null) { + if (callback != null) { + callback.onFinished(); + } + return; + } + dictionary.addMultipleDictionaryEntriesToDictionary(languageModelParams, callback); + } + // Bulk import // TODO: Support multi locale to add bigram public void addBigramsToPersonalizationDictionary( diff --git a/java/src/com/android/inputmethod/latin/settings/DebugSettings.java b/java/src/com/android/inputmethod/latin/settings/DebugSettings.java index da1fb73fe..d060485bd 100644 --- a/java/src/com/android/inputmethod/latin/settings/DebugSettings.java +++ b/java/src/com/android/inputmethod/latin/settings/DebugSettings.java @@ -112,8 +112,7 @@ public final class DebugSettings extends PreferenceFragment updateDebugMode(); mServiceNeedsRestart = true; } - } else if (key.equals(PREF_FORCE_NON_DISTINCT_MULTITOUCH) - || key.equals(PREF_USE_ONLY_PERSONALIZATION_DICTIONARY_FOR_DEBUG)) { + } else if (key.equals(PREF_FORCE_NON_DISTINCT_MULTITOUCH)) { mServiceNeedsRestart = true; } } |