diff options
Diffstat (limited to 'java')
98 files changed, 522 insertions, 799 deletions
diff --git a/java/res/values-af/strings.xml b/java/res/values-af/strings.xml index 98f80e26d..bce3b6e89 100644 --- a/java/res/values-af/strings.xml +++ b/java/res/values-af/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Engels (VS)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Geen taal nie"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Geen taal (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Geen taal nie (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Geen taal nie (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Geen taal nie (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Geen taal nie (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Geen taal nie (PC)"</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.xml b/java/res/values-am/strings.xml index 211916959..27902c4e2 100644 --- a/java/res/values-am/strings.xml +++ b/java/res/values-am/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"እንግሊዘኛ (ዩ.ኤስ)"</string> <string name="subtype_no_language" msgid="141420857808801746">"ምንም ቋንቋ"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"ቋንቋ አልባ (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"ቋንቋ አልባ (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"ቋንቋ አልባ (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"ቋንቋ አልባ (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"ቋንቋ አልባ (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"ቋንቋ አልባ (PC)"</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.xml b/java/res/values-ar/strings.xml index cd3303d9c..6f1312d55 100644 --- a/java/res/values-ar/strings.xml +++ b/java/res/values-ar/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"الإنجليزية (الولايات المتحدة)"</string> <string name="subtype_no_language" msgid="141420857808801746">"بدون لغة"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"بدون لغة (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"بدون لغة (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"بدون لغة (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"بدون لغة (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"بدون لغة (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"بدون لغة (PC)"</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-be/strings.xml b/java/res/values-be/strings.xml index 24bd8132e..0ecf55b9a 100644 --- a/java/res/values-be/strings.xml +++ b/java/res/values-be/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Англійская (ЗША)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Мова не выбрана"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Мова не выбрана (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Няма мовы (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Няма мовы (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Няма мовы (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Няма мовы (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Няма мовы (PC)"</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.xml b/java/res/values-bg/strings.xml index 73367551e..78b0bb59c 100644 --- a/java/res/values-bg/strings.xml +++ b/java/res/values-bg/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"английски (САЩ)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Без език"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Без език („QWERTY“)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Без език (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Без език (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Без език (Дворак)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Без език (Коулмак)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Без език (PC)"</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.xml b/java/res/values-ca/strings.xml index 7b1e9c37f..648b90222 100644 --- a/java/res/values-ca/strings.xml +++ b/java/res/values-ca/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Anglès (EUA)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Cap idioma"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Cap idioma (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Cap idioma (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Cap idioma (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Cap idioma (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Cap idioma (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Cap idioma (PC)"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Estils d\'entrada pers."</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.xml b/java/res/values-cs/strings.xml index 53672fdcb..fd1ed915a 100644 --- a/java/res/values-cs/strings.xml +++ b/java/res/values-cs/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"angličtina (USA)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Žádný jazyk"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Žádný jazyk (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Žádný jazyk (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Žádný jazyk (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Žádný jazyk (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Žádný jazyk (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Žádný jazyk (PC)"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Vlastní styly vstupu"</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.xml b/java/res/values-da/strings.xml index ee09ea523..532dd75aa 100644 --- a/java/res/values-da/strings.xml +++ b/java/res/values-da/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Engelsk (USA)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Intet sprog"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Ingen sprog (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Intet sprog (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Intet sprog (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Intet sprog (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Intet sprog (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Intet sprog (PC)"</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> diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml index 05a6be2d3..030508f9e 100644 --- a/java/res/values-de/strings.xml +++ b/java/res/values-de/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Englisch (USA)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Keine Sprache"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Keine Sprache (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Keine Sprache (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Keine Sprache (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Keine Sprache (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Keine Sprache (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Keine Sprache (PC)"</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.xml b/java/res/values-el/strings.xml index 041ae17d4..328409343 100644 --- a/java/res/values-el/strings.xml +++ b/java/res/values-el/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Αγγλικά (Η.Π.Α)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Καμία γλώσσα"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Καμία γλώσσα (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Καμία γλώσσα (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Καμία γλώσσα (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Καμία γλώσσα (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Καμία γλώσσα (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Καμία γλώσσα (PC)"</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.xml b/java/res/values-en-rGB/strings.xml index 7785512b2..da53a87cf 100644 --- a/java/res/values-en-rGB/strings.xml +++ b/java/res/values-en-rGB/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"English (US)"</string> <string name="subtype_no_language" msgid="141420857808801746">"No language"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"No language (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"No language (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"No language (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"No language (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"No language (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"No language (PC)"</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.xml b/java/res/values-es-rUS/strings.xml index edebb6f71..f6b13e650 100644 --- a/java/res/values-es-rUS/strings.xml +++ b/java/res/values-es-rUS/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Inglés (EE.UU.)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Ningún idioma"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Ningún idioma (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Ningún idioma (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Ningún idioma (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Ningún idioma (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Ningún idioma (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Ningún idioma (PC)"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Estilos entrada pers."</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.xml b/java/res/values-es/strings.xml index 79159f0ce..c37458945 100644 --- a/java/res/values-es/strings.xml +++ b/java/res/values-es/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"inglés (EE.UU.)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Ningún idioma"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Ningún idioma (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Ningún idioma (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Ningún idioma (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Ningún idioma (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Ningún idioma (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Ningún idioma (PC)"</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/strings.xml b/java/res/values-et/strings.xml index e6741549f..698221ec2 100644 --- a/java/res/values-et/strings.xml +++ b/java/res/values-et/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Inglise (USA)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Keel puudub"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Keel puudub (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Keel puudub (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Keel puudub (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Keel puudub (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Keel puudub (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Keel puudub (PC)"</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.xml b/java/res/values-fa/strings.xml index 25d1a79ec..1a8ff8c98 100644 --- a/java/res/values-fa/strings.xml +++ b/java/res/values-fa/strings.xml @@ -124,16 +124,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"انگیسی (US)"</string> <string name="subtype_no_language" msgid="141420857808801746">"زبانی موجود نیست"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"هیچ کدام از زبانها (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"هیچکدام از زبانها (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"هیچکدام از زبانها (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"هیچکدام از زبانها (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"هیچکدام از زبانها (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"هیچکدام از زبانها (PC)"</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.xml b/java/res/values-fi/strings.xml index 365c85bd1..b518148fb 100644 --- a/java/res/values-fi/strings.xml +++ b/java/res/values-fi/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"englanti (Yhdysvallat)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Ei kieltä"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Ei kieltä (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Ei kieltä (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Ei kieltä (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Ei kieltä (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Ei kieltä (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Ei kieltä (PC)"</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/strings.xml b/java/res/values-fr/strings.xml index a8958a112..956447d45 100644 --- a/java/res/values-fr/strings.xml +++ b/java/res/values-fr/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Anglais (États-Unis)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Aucune langue"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Pas de langue (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Aucune langue (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Aucune langue (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Aucune langue (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Aucune langue (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Aucune langue (PC)"</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.xml b/java/res/values-hi/strings.xml index 3e7aacdd1..4f20e5e74 100644 --- a/java/res/values-hi/strings.xml +++ b/java/res/values-hi/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"अंग्रेज़ी (यूएस)"</string> <string name="subtype_no_language" msgid="141420857808801746">"कोई भाषा नहीं"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"कोई भाषा नहीं (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"कोई भाषा नहीं (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"कोई भाषा नहीं (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"कोई भाषा नहीं (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"कोई भाषा नहीं (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"कोई भाषा नहीं (PC)"</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-hr/strings.xml b/java/res/values-hr/strings.xml index 446a67009..124fcb67e 100644 --- a/java/res/values-hr/strings.xml +++ b/java/res/values-hr/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Engleski (SAD)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Nema jezika"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Nema jezika (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Nema jezika (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Nema jezika (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Nema jezika (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Nema jezika (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Nema jezika (PC)"</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.xml b/java/res/values-hu/strings.xml index 6561fcf67..bdf684860 100644 --- a/java/res/values-hu/strings.xml +++ b/java/res/values-hu/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"angol (amerikai)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Nincs nyelv"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Nincs nyelv (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Nincs nyelv (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Nincs nyelv (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Nincs nyelv (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Nincs nyelv (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Nincs nyelv (PC)"</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-in/strings.xml b/java/res/values-in/strings.xml index cdd7c6a9b..ca1b8deb0 100644 --- a/java/res/values-in/strings.xml +++ b/java/res/values-in/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Inggris (AS)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Tidak ada bahasa"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Tanpa bahasa (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Tanpa bahasa (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Tanpa bahasa (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Tanpa bahasa (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Tanpa bahasa (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Tanpa bahasa (PC)"</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.xml b/java/res/values-it/strings.xml index 584e17210..4f311cff5 100644 --- a/java/res/values-it/strings.xml +++ b/java/res/values-it/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Inglese (USA)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Nessuna lingua"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Nessuna lingua (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Nessuna lingua (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Nessuna lingua (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Nessuna lingua (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Nessuna lingua (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Nessuna lingua (PC)"</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.xml b/java/res/values-iw/strings.xml index fdbec4eee..d625c47fc 100644 --- a/java/res/values-iw/strings.xml +++ b/java/res/values-iw/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"אנגלית (ארה\"ב)"</string> <string name="subtype_no_language" msgid="141420857808801746">"ללא שפה"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"אין שפה (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"אין שפה (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"אין שפה (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"אין שפה (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"אין שפה (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"אין שפה (PC)"</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-ja/strings.xml b/java/res/values-ja/strings.xml index ec0ddbfb4..ff9e72b0e 100644 --- a/java/res/values-ja/strings.xml +++ b/java/res/values-ja/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"英語（米国）"</string> <string name="subtype_no_language" msgid="141420857808801746">"言語設定なし"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"言語設定なし（QWERTY）"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"言語設定なし（QWERTZ）"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"言語設定なし（AZERTY）"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"言語設定なし（Dvorak）"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"言語設定なし（Colemak）"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"言語設定なし（PC）"</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.xml b/java/res/values-ko/strings.xml index 39447fe28..6083eafcc 100644 --- a/java/res/values-ko/strings.xml +++ b/java/res/values-ko/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"영어(미국)"</string> <string name="subtype_no_language" msgid="141420857808801746">"언어가 없음"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"언어가 없음(QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"언어 없음(QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"언어 없음(AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"언어 없음(드보락)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"언어 없음(콜맥)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"언어 없음(PC)"</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.xml b/java/res/values-lt/strings.xml index 8cf4da2f1..c1bb23d3a 100644 --- a/java/res/values-lt/strings.xml +++ b/java/res/values-lt/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Anglų k. (JAV)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Kalbos nėra"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Nėra kalbos (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Nėra kalbos (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Nėra kalbos (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Nėra kalbos (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Nėra kalbos (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Nėra kalbos (PC)"</string> <string name="custom_input_styles_title" msgid="8429952441821251512">"Tinkinti įv. stiliai"</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.xml b/java/res/values-lv/strings.xml index 8217914bc..9a5ad6df1 100644 --- a/java/res/values-lv/strings.xml +++ b/java/res/values-lv/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Angļu valoda (ASV)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Nav valodas"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Nav valodas (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Nav valodas (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Nav valodas (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Nav valodas (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Nav valodas (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Nav valodas (PC)"</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-ms/strings.xml b/java/res/values-ms/strings.xml index 4ba315994..2d6872e30 100644 --- a/java/res/values-ms/strings.xml +++ b/java/res/values-ms/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Bahasa Inggeris (AS)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Tiada bahasa"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Tiada bahasa (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Tiada bahasa (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Tiada bahasa (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Tiada bahasa (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Tiada bahasa (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Tiada bahasa (PC)"</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.xml b/java/res/values-nb/strings.xml index 87056ce9a..3810e2bcc 100644 --- a/java/res/values-nb/strings.xml +++ b/java/res/values-nb/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Engelsk (USA)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Ingen språk"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Ingen språk (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Ingen språk (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Ingen språk (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Ingen språk (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Ingen språk (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Ingen språk (PC)"</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.xml b/java/res/values-nl/strings.xml index 01a684ea0..7035801cb 100644 --- a/java/res/values-nl/strings.xml +++ b/java/res/values-nl/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Engels (VS)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Geen taal"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Geen taal (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Geen taal (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Geen taal (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Geen taal (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Geen taal (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Geen taal (PC)"</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.xml b/java/res/values-pl/strings.xml index 5df96e893..c938f7fbd 100644 --- a/java/res/values-pl/strings.xml +++ b/java/res/values-pl/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Angielska (Stany Zjednoczone)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Brak języka"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Brak języka (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Brak języka (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Brak języka (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Brak języka (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Brak języka (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Brak języka (PC)"</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.xml b/java/res/values-pt-rPT/strings.xml index ff82cf46e..4d6e3367e 100644 --- a/java/res/values-pt-rPT/strings.xml +++ b/java/res/values-pt-rPT/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Inglês (EUA)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Nenhum idioma"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Nenhum idioma (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Nenhum idioma (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Nenhum idioma (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Nenhum idioma (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Nenh. idioma (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Nenhum idioma (PC)"</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.xml b/java/res/values-pt/strings.xml index 1db221bb1..6985cc89a 100644 --- a/java/res/values-pt/strings.xml +++ b/java/res/values-pt/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Inglês (EUA)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Sem idioma"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Nenhum idioma (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Nenhum idioma (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Nenhum idioma (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Nenhum idioma (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Nenhum idioma (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Nenhum idioma (PC)"</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.xml b/java/res/values-ro/strings.xml index 016aa8f34..752f633be 100644 --- a/java/res/values-ro/strings.xml +++ b/java/res/values-ro/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Engleză (S.U.A.)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Nicio limbă"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Nicio limbă (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Nicio limbă (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Nicio limbă (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Nicio limbă (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Nicio limbă (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Nicio limbă (PC)"</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.xml b/java/res/values-ru/strings.xml index 4ea809a8e..16ac8d944 100644 --- a/java/res/values-ru/strings.xml +++ b/java/res/values-ru/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"английский (США)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Язык не указан"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Язык не указан (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Язык не задан (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Язык не задан (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Язык не задан (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Яз. не задан (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Язык не задан (PC)"</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.xml b/java/res/values-sk/strings.xml index 490d0bcf1..04600e557 100644 --- a/java/res/values-sk/strings.xml +++ b/java/res/values-sk/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Anglická klávesnica (US)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Žiadny jazyk"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Žiadny jazyk (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Žiadny jazyk (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Žiadny jazyk (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Žiadny jazyk (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Žiadny jazyk (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Žiadny jazyk (PC)"</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.xml b/java/res/values-sl/strings.xml index 8a68df220..f304ab94e 100644 --- a/java/res/values-sl/strings.xml +++ b/java/res/values-sl/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"angleščina (ZDA)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Ni jezika"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Ni jezika (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Ni jezika (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Ni jezika (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Ni jezika (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Ni jezika (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Ni jezika (PC)"</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.xml b/java/res/values-sr/strings.xml index 5f55385a0..d03c75dac 100644 --- a/java/res/values-sr/strings.xml +++ b/java/res/values-sr/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"енглески (САД)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Без језика"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Нема језика (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Без језика (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Без језика (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Без језика (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Без језика (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Без језика (PC)"</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.xml b/java/res/values-sv/strings.xml index 6ae66db6d..1b8fb7d7b 100644 --- a/java/res/values-sv/strings.xml +++ b/java/res/values-sv/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Engelskt (amerikanskt)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Inget språk"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Inget språk (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Inget språk (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Inget språk (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Inget språk (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Inget språk (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Inget språk (PC)"</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.xml b/java/res/values-sw/strings.xml index da1654848..c6e16dc23 100644 --- a/java/res/values-sw/strings.xml +++ b/java/res/values-sw/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Kiingereza cha (Marekani)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Hakuna lugha"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Hakuna lugha (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Hakuna lugha (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Hakuna lugha (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Hakuna lugha (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Hakuna lugha (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Hakuna lugha (PC)"</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-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml index 8a59c9b54..a478df89a 100644 --- a/java/res/values-sw600dp-land/dimens.xml +++ b/java/res/values-sw600dp-land/dimens.xml @@ -35,7 +35,8 @@ <fraction name="key_bottom_gap_gb">5.200%p</fraction> <fraction name="key_horizontal_gap_gb">1.447%p</fraction> - <fraction name="key_bottom_gap_ics">4.0%p</fraction> + <fraction name="key_bottom_gap_ics">4.5%p</fraction> + <fraction name="key_horizontal_gap_ics">0.9%p</fraction> <fraction name="keyboard_bottom_padding_ics">0.0%p</fraction> <dimen name="popup_key_height">81.9dp</dimen> @@ -43,13 +44,14 @@ <!-- left or right padding of label alignment --> <dimen name="key_label_horizontal_padding">18dp</dimen> - <fraction name="key_letter_ratio">45%</fraction> + <fraction name="key_letter_ratio">50%</fraction> <fraction name="key_large_letter_ratio">48%</fraction> <fraction name="key_label_ratio">32%</fraction> <fraction name="key_hint_letter_ratio">23%</fraction> <fraction name="key_hint_label_ratio">34%</fraction> <fraction name="key_uppercase_letter_ratio">29%</fraction> - <fraction name="spacebar_text_ratio">33.33%</fraction> + <fraction name="spacebar_text_ratio">30.0%</fraction> + <dimen name="key_uppercase_letter_padding">4dp</dimen> <dimen name="suggestions_strip_padding">252.0dp</dimen> <integer name="max_more_suggestions_row">5</integer> diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml index cb2a86153..8ecdffb47 100644 --- a/java/res/values-sw600dp/dimens.xml +++ b/java/res/values-sw600dp/dimens.xml @@ -38,8 +38,9 @@ <fraction name="key_bottom_gap_gb">4.625%p</fraction> <fraction name="key_horizontal_gap_gb">2.113%p</fraction> - <fraction name="key_bottom_gap_ics">4.0%p</fraction> - <fraction name="keyboard_bottom_padding_ics">0.0%p</fraction> + <fraction name="key_bottom_gap_ics">4.5%p</fraction> + <fraction name="key_horizontal_gap_ics">1.565%p</fraction> + <fraction name="keyboard_bottom_padding_ics">4.0%p</fraction> <dimen name="more_keys_keyboard_key_horizontal_padding">6dp</dimen> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> @@ -58,9 +59,9 @@ <fraction name="key_label_ratio">25%</fraction> <fraction name="key_hint_letter_ratio">23%</fraction> <fraction name="key_hint_label_ratio">28%</fraction> - <fraction name="key_uppercase_letter_ratio">26%</fraction> + <fraction name="key_uppercase_letter_ratio">22%</fraction> <fraction name="key_preview_text_ratio">50%</fraction> - <fraction name="spacebar_text_ratio">32.14%</fraction> + <fraction name="spacebar_text_ratio">28.0%</fraction> <dimen name="key_preview_height">94.5dp</dimen> <dimen name="key_preview_offset">16.0dp</dimen> diff --git a/java/res/values-th/strings.xml b/java/res/values-th/strings.xml index 0d8ac4cbe..57ac9babc 100644 --- a/java/res/values-th/strings.xml +++ b/java/res/values-th/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"อังกฤษ (อเมริกัน)"</string> <string name="subtype_no_language" msgid="141420857808801746">"ไม่มีภาษา"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"ไม่มีภาษา (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"ไม่มีภาษา (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"ไม่มีภาษา (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"ไม่มีภาษา (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"ไม่มีภาษา (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"ไม่มีภาษา (PC)"</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.xml b/java/res/values-tl/strings.xml index cc1839e60..4ee277058 100644 --- a/java/res/values-tl/strings.xml +++ b/java/res/values-tl/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Ingles (Estados Unidos)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Walang wika"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Walang wika (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Walang wika (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Walang wika (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Walang wika (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Walang wika (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Walang wika (PC)"</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.xml b/java/res/values-tr/strings.xml index 6622be6cd..f774704e3 100644 --- a/java/res/values-tr/strings.xml +++ b/java/res/values-tr/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"İngilizce (ABD)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Dil yok"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Dil yok (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Dil yok (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Dil yok (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Dil yok (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Dil yok (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Dil yok (PC)"</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.xml b/java/res/values-uk/strings.xml index b4f760bce..7c96a5199 100644 --- a/java/res/values-uk/strings.xml +++ b/java/res/values-uk/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Англійська (США)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Мову не вибрано"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Немає мови (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Мову не вибр. (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Мову не вибр. (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Мову не вибр. (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Мову не вибр.(Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Мову не вибрано (ПК)"</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.xml b/java/res/values-vi/strings.xml index 27ad54ee2..60cd106b8 100644 --- a/java/res/values-vi/strings.xml +++ b/java/res/values-vi/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"Tiếng Anh (Mỹ)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Không có ngôn ngữ nào"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Không có ngôn ngữ (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"0 ngôn ngữ (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"0 ngôn ngữ (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"0 ngôn ngữ (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"0 ngôn ngữ (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"0 ngôn ngữ (PC)"</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.xml b/java/res/values-zh-rCN/strings.xml index 657bac19d..3d7a08eb8 100644 --- a/java/res/values-zh-rCN/strings.xml +++ b/java/res/values-zh-rCN/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"英语（美国）"</string> <string name="subtype_no_language" msgid="141420857808801746">"无语言"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"无语言（QWERTY 键盘）"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"无语言（QWERTZ 键盘）"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"无语言（AZERTY 键盘）"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"无语言（Dvorak 键盘）"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"无语言（Colemak 键盘）"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"无语言（PC 键盘）"</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.xml b/java/res/values-zh-rTW/strings.xml index 447c0e453..66d45dc02 100644 --- a/java/res/values-zh-rTW/strings.xml +++ b/java/res/values-zh-rTW/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"英文 (美式)"</string> <string name="subtype_no_language" msgid="141420857808801746">"無語言"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"無語言 (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"無語言 (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"無語言 (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"無語言 (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"無語言 (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"無語言 (PC)"</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.xml b/java/res/values-zu/strings.xml index 032466e52..a95b80e5c 100644 --- a/java/res/values-zu/strings.xml +++ b/java/res/values-zu/strings.xml @@ -120,16 +120,11 @@ <string name="subtype_en_US" msgid="6160452336634534239">"i-English (US)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Akunalimi"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Akunalimi (QWERTY)"</string> - <!-- no translation found for subtype_no_language_qwertz (1177848172397202890) --> - <skip /> - <!-- no translation found for subtype_no_language_azerty (8721460968141187394) --> - <skip /> - <!-- no translation found for subtype_no_language_dvorak (3122976737669823935) --> - <skip /> - <!-- no translation found for subtype_no_language_colemak (4205992994906097244) --> - <skip /> - <!-- no translation found for subtype_no_language_pcqwerty (8840928374394180189) --> - <skip /> + <string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Alukho ulimi (QWERTZ)"</string> + <string name="subtype_no_language_azerty" msgid="8721460968141187394">"Alukho ulimi (AZERTY)"</string> + <string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Alukho ulimi (Dvorak)"</string> + <string name="subtype_no_language_colemak" msgid="4205992994906097244">"Alukho ulimi (Colemak)"</string> + <string name="subtype_no_language_pcqwerty" msgid="8840928374394180189">"Alukho ulimi (PC)"</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 e14633a2e..dbe3cd74f 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -68,7 +68,7 @@ <attr name="keyHintLetterPadding" format="dimension" /> <!-- Bottom padding of popup hint letter "..." to the edge of the key.--> <attr name="keyPopupHintLetterPadding" format="dimension" /> - <!-- Top and right padding of shifted letter hint to the edge of the key.--> + <!-- Right padding of shifted letter hint to the edge of the key.--> <attr name="keyShiftedLetterHintPadding" format="dimension" /> <!-- Color to use for the label in a key. --> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index e258f3bff..69fdea79f 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -248,23 +248,23 @@ <!-- Title of the item to change the keyboard theme [CHAR LIMIT=20]--> <string name="keyboard_layout">Keyboard theme</string> - <!-- Description for English (United Kingdom) keyboard subtype [CHAR LIMIT=22] --> + <!-- Description for English (United Kingdom) keyboard subtype [CHAR LIMIT=25] --> <string name="subtype_en_GB">English (UK)</string> - <!-- Description for English (United States) keyboard subtype [CHAR LIMIT=22] --> + <!-- Description for English (United States) keyboard subtype [CHAR LIMIT=25] --> <string name="subtype_en_US">English (US)</string> - <!-- Description for language agnostic keyboard subtype [CHAR LIMIT=22] --> + <!-- Description for language agnostic keyboard subtype [CHAR LIMIT=25] --> <string name="subtype_no_language">No language</string> - <!-- Description for language agnostic QWERTY keyboard subtype [CHAR LIMIT=22] --> + <!-- Description for language agnostic QWERTY keyboard subtype [CHAR LIMIT=25] --> <string name="subtype_no_language_qwerty">No language (QWERTY)</string> - <!-- Description for language agnostic QWERTZ keyboard subtype [CHAR LIMIT=22] --> + <!-- Description for language agnostic QWERTZ keyboard subtype [CHAR LIMIT=25] --> <string name="subtype_no_language_qwertz">No language (QWERTZ)</string> - <!-- Description for language agnostic AZERTY keyboard subtype [CHAR LIMIT=22] --> + <!-- Description for language agnostic AZERTY keyboard subtype [CHAR LIMIT=25] --> <string name="subtype_no_language_azerty">No language (AZERTY)</string> - <!-- Description for language agnostic Dvorak keyboard subtype [CHAR LIMIT=22] --> + <!-- Description for language agnostic Dvorak keyboard subtype [CHAR LIMIT=25] --> <string name="subtype_no_language_dvorak">No language (Dvorak)</string> - <!-- Description for language agnostic Colemak keyboard subtype [CHAR LIMIT=22] --> + <!-- Description for language agnostic Colemak keyboard subtype [CHAR LIMIT=25] --> <string name="subtype_no_language_colemak">No language (Colemak)</string> - <!-- Description for language agnostic PC QWERTY keyboard subtype [CHAR LIMIT=22] --> + <!-- Description for language agnostic PC QWERTY keyboard subtype [CHAR LIMIT=25] --> <string name="subtype_no_language_pcqwerty">No language (PC)</string> <!-- Title of the preference settings for custom input styles (language and keyboard layout pairs) [CHAR LIMIT=35]--> diff --git a/java/res/xml-sw600dp-land/kbd_number.xml b/java/res/xml-sw600dp-land/kbd_number.xml index 9d358b678..cb86b3b2f 100644 --- a/java/res/xml-sw600dp-land/kbd_number.xml +++ b/java/res/xml-sw600dp-land/kbd_number.xml @@ -21,7 +21,7 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:keyboardHorizontalEdgesPadding="10%p" - latin:keyWidth="15.00%p" + latin:keyWidth="18%p" > <include latin:keyboardLayout="@xml/rows_number" /> diff --git a/java/res/xml-sw600dp-land/kbd_phone.xml b/java/res/xml-sw600dp-land/kbd_phone.xml index abac6bd4f..71c7c04a1 100644 --- a/java/res/xml-sw600dp-land/kbd_phone.xml +++ b/java/res/xml-sw600dp-land/kbd_phone.xml @@ -21,7 +21,7 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:keyboardHorizontalEdgesPadding="10%p" - latin:keyWidth="15.00%p" + latin:keyWidth="18%p" > <include latin:keyboardLayout="@xml/rows_phone" /> diff --git a/java/res/xml-sw600dp-land/kbd_phone_symbols.xml b/java/res/xml-sw600dp-land/kbd_phone_symbols.xml index e3f56bce7..39bdae3c7 100644 --- a/java/res/xml-sw600dp-land/kbd_phone_symbols.xml +++ b/java/res/xml-sw600dp-land/kbd_phone_symbols.xml @@ -21,7 +21,7 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:keyboardHorizontalEdgesPadding="10%p" - latin:keyWidth="15.00%p" + latin:keyWidth="18%p" > <!-- Tablet doesn't have phone symbols keyboard --> <include diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml index 70cf6a2ca..4a8b08c2a 100644 --- a/java/res/xml-sw600dp/kbd_number.xml +++ b/java/res/xml-sw600dp/kbd_number.xml @@ -20,7 +20,7 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="15.00%p" + latin:keyWidth="18%p" > <include latin:keyboardLayout="@xml/rows_number" /> diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml index 72acef21c..f63f1c648 100644 --- a/java/res/xml-sw600dp/kbd_phone.xml +++ b/java/res/xml-sw600dp/kbd_phone.xml @@ -20,7 +20,7 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="15.00%p" + latin:keyWidth="18%p" > <include latin:keyboardLayout="@xml/rows_phone" /> diff --git a/java/res/xml-sw600dp/kbd_phone_symbols.xml b/java/res/xml-sw600dp/kbd_phone_symbols.xml index 9faeaf4e0..a0f55b732 100644 --- a/java/res/xml-sw600dp/kbd_phone_symbols.xml +++ b/java/res/xml-sw600dp/kbd_phone_symbols.xml @@ -20,7 +20,7 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="15.00%p" + latin:keyWidth="18%p" > <!-- Tablet doesn't have phone symbols keyboard --> <include diff --git a/java/res/xml-sw600dp/key_f1.xml b/java/res/xml-sw600dp/key_f1.xml deleted file mode 100644 index faf087558..000000000 --- a/java/res/xml-sw600dp/key_f1.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <switch> - <case - latin:mode="email|url" - > - <Key - latin:keyStyle="comKeyStyle" /> - </case> - <default> - <Key - latin:keyLabel="/" - latin:keyHintLabel="\@" - latin:moreKeys="\@" - latin:keyStyle="hasShiftedLetterHintStyle" /> - </default> - </switch> -</merge> diff --git a/java/res/xml-sw600dp/key_smiley.xml b/java/res/xml-sw600dp/key_smiley.xml deleted file mode 100644 index 3430d7898..000000000 --- a/java/res/xml-sw600dp/key_smiley.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2011, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <switch> - <case - latin:mode="email" - > - <Key - latin:keyLabel="\@" /> - </case> - <case - latin:mode="url" - > - <Key - latin:keyLabel="-" - latin:keyHintLabel="_" - latin:moreKeys="_" - latin:keyStyle="hasShiftedLetterHintStyle" /> - </case> - <case - latin:imeAction="actionSearch" - > - <Key - latin:keyLabel=":" - latin:keyHintLabel="+" - latin:moreKeys="+" - latin:keyStyle="hasShiftedLetterHintStyle" /> - </case> - <default> - <Key - latin:keyStyle="smileyKeyStyle" /> - </default> - </switch> -</merge> diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml index 884cea1b6..9f16d1b17 100644 --- a/java/res/xml-sw600dp/key_styles_common.xml +++ b/java/res/xml-sw600dp/key_styles_common.xml @@ -161,7 +161,7 @@ <key-style latin:styleName="comKeyStyle" latin:keyLabel="!text/keylabel_for_popular_domain" - latin:keyLabelFlags="fontNormal|hasPopupHint|preserveCase" + latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase" latin:keyOutputText="!text/keylabel_for_popular_domain" latin:moreKeys="!text/more_keys_for_popular_domain" /> </merge> diff --git a/java/res/xml-sw600dp/keys_f1f2.xml b/java/res/xml-sw600dp/keys_f1f2.xml new file mode 100644 index 000000000..14b7231c9 --- /dev/null +++ b/java/res/xml-sw600dp/keys_f1f2.xml @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, 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. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <switch> + <case + latin:mode="url" + > + <Key + latin:keyStyle="comKeyStyle" + latin:keyWidth="17.8%p" /> + </case> + <default> + <switch> + <case + latin:mode="email" + > + <Key + latin:keyStyle="comKeyStyle" /> + </case> + <case + latin:imeAction="actionSearch" + > + <Key + latin:keyLabel=":" + latin:keyHintLabel="+" + latin:moreKeys="+" + latin:keyStyle="hasShiftedLetterHintStyle" /> + </case> + <default> + <Key + latin:keyStyle="smileyKeyStyle" /> + </default> + </switch> + <switch> + <case + latin:mode="email" + > + <Key + latin:keyLabel="\@" /> + </case> + <default> + <Key + latin:keyLabel="/" + latin:keyHintLabel="\@" + latin:moreKeys="\@" + latin:keyStyle="hasShiftedLetterHintStyle" /> + </default> + </switch> + </default> + </switch> +</merge> diff --git a/java/res/xml-sw600dp/row_dvorak4.xml b/java/res/xml-sw600dp/row_dvorak4.xml index 14a5fd81d..63ab8a835 100644 --- a/java/res/xml-sw600dp/row_dvorak4.xml +++ b/java/res/xml-sw600dp/row_dvorak4.xml @@ -27,10 +27,8 @@ <Key latin:keyStyle="toSymbolKeyStyle" latin:keyWidth="13.0%p" /> - <Key - latin:keyStyle="tabKeyStyle" /> <include - latin:keyboardLayout="@xml/key_f1" /> + latin:keyboardLayout="@xml/keys_f1f2" /> <include latin:keyXPos="30.750%p" latin:keyboardLayout="@xml/key_space" /> diff --git a/java/res/xml-sw600dp/row_hebrew4.xml b/java/res/xml-sw600dp/row_hebrew4.xml index 536b65397..3d50c7554 100644 --- a/java/res/xml-sw600dp/row_hebrew4.xml +++ b/java/res/xml-sw600dp/row_hebrew4.xml @@ -27,10 +27,8 @@ <Key latin:keyStyle="toSymbolKeyStyle" latin:keyWidth="13.0%p" /> - <Key - latin:keyStyle="tabKeyStyle" /> <include - latin:keyboardLayout="@xml/key_f1" /> + latin:keyboardLayout="@xml/keys_f1f2" /> <include latin:keyboardLayout="@xml/key_space" /> <include diff --git a/java/res/xml-sw600dp/row_pcqwerty5.xml b/java/res/xml-sw600dp/row_pcqwerty5.xml index 83bc83e69..e9e231a16 100644 --- a/java/res/xml-sw600dp/row_pcqwerty5.xml +++ b/java/res/xml-sw600dp/row_pcqwerty5.xml @@ -33,7 +33,7 @@ latin:keyWidth="10.5%p" /> </case> <case - latin:mode="email|url" + latin:mode="url" > <Key latin:keyStyle="comKeyStyle" @@ -41,9 +41,9 @@ latin:keyWidth="10.5%p" /> </case> <default> - <Spacer - latin:keyXPos="15.0%p" - latin:keyWidth="10.5%p" /> + <include + latin:keyboardLayout="@xml/keys_f1f2" + latin:keyXPos="18.5%p" /> </default> </switch> <switch> diff --git a/java/res/xml-sw600dp/row_qwerty4.xml b/java/res/xml-sw600dp/row_qwerty4.xml index 76ac3a0d0..a41dc6480 100644 --- a/java/res/xml-sw600dp/row_qwerty4.xml +++ b/java/res/xml-sw600dp/row_qwerty4.xml @@ -27,10 +27,8 @@ <Key latin:keyStyle="toSymbolKeyStyle" latin:keyWidth="13.0%p" /> - <Key - latin:keyStyle="tabKeyStyle" /> <include - latin:keyboardLayout="@xml/key_f1" /> + latin:keyboardLayout="@xml/keys_f1f2" /> <include latin:keyXPos="30.750%p" latin:keyboardLayout="@xml/key_space" /> diff --git a/java/res/xml-sw600dp/row_symbols4.xml b/java/res/xml-sw600dp/row_symbols4.xml index d294e20cf..4c0ad2334 100644 --- a/java/res/xml-sw600dp/row_symbols4.xml +++ b/java/res/xml-sw600dp/row_symbols4.xml @@ -28,7 +28,7 @@ latin:keyStyle="toAlphaKeyStyle" latin:keyWidth="13.0%p" /> <Key - latin:keyStyle="tabKeyStyle" /> + latin:keyStyle="smileyKeyStyle" /> <Key latin:keyLabel="\@" /> <include diff --git a/java/res/xml-sw600dp/row_symbols_shift4.xml b/java/res/xml-sw600dp/row_symbols_shift4.xml index 3a78c7200..23db19304 100644 --- a/java/res/xml-sw600dp/row_symbols_shift4.xml +++ b/java/res/xml-sw600dp/row_symbols_shift4.xml @@ -28,7 +28,7 @@ latin:keyStyle="toAlphaKeyStyle" latin:keyWidth="13.0%p" /> <Key - latin:keyStyle="tabKeyStyle" /> + latin:keyStyle="smileyKeyStyle" /> <include latin:keyXPos="30.750%p" latin:keyboardLayout="@xml/key_space" /> diff --git a/java/res/xml-sw600dp/rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml index 55223267f..c796a508e 100644 --- a/java/res/xml-sw600dp/rows_arabic.xml +++ b/java/res/xml-sw600dp/rows_arabic.xml @@ -46,10 +46,8 @@ latin:keyWidth="7.6%p" > <include - latin:keyboardLayout="@xml/key_smiley" - latin:keyWidth="10.0%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_arabic3" /> + latin:keyboardLayout="@xml/rowkeys_arabic3" + latin:keyXPos="10.0%p" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> diff --git a/java/res/xml-sw600dp/rows_azerty.xml b/java/res/xml-sw600dp/rows_azerty.xml index 3ec22d302..fbfecb341 100644 --- a/java/res/xml-sw600dp/rows_azerty.xml +++ b/java/res/xml-sw600dp/rows_azerty.xml @@ -53,9 +53,9 @@ latin:keyboardLayout="@xml/rowkeys_azerty3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <include - latin:keyboardLayout="@xml/key_smiley" - latin:keyXPos="-8.5%p" + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyXPos="-10.0%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_bulgarian.xml b/java/res/xml-sw600dp/rows_bulgarian.xml index a3b77cc12..8c41f9634 100644 --- a/java/res/xml-sw600dp/rows_bulgarian.xml +++ b/java/res/xml-sw600dp/rows_bulgarian.xml @@ -53,9 +53,9 @@ latin:keyboardLayout="@xml/rowkeys_bulgarian3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <include - latin:keyboardLayout="@xml/key_smiley" - latin:keyXPos="-9.0%p" + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyXPos="-10.0%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_colemak.xml b/java/res/xml-sw600dp/rows_colemak.xml index aada5eb7a..b34957c5b 100644 --- a/java/res/xml-sw600dp/rows_colemak.xml +++ b/java/res/xml-sw600dp/rows_colemak.xml @@ -55,9 +55,9 @@ latin:keyboardLayout="@xml/rowkeys_colemak3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <include - latin:keyboardLayout="@xml/key_smiley" - latin:keyXPos="-8.5%p" + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyXPos="-10.0%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_dvorak.xml b/java/res/xml-sw600dp/rows_dvorak.xml index aec4a5cf5..d361c3e0c 100644 --- a/java/res/xml-sw600dp/rows_dvorak.xml +++ b/java/res/xml-sw600dp/rows_dvorak.xml @@ -53,9 +53,9 @@ latin:keyWidth="10.0%p" /> <include latin:keyboardLayout="@xml/rowkeys_dvorak3" /> - <include - latin:keyboardLayout="@xml/key_smiley" - latin:keyXPos="-8.5%p" + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyXPos="-10.0%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_east_slavic.xml b/java/res/xml-sw600dp/rows_east_slavic.xml index 26fd7dfe1..3f8e50d15 100644 --- a/java/res/xml-sw600dp/rows_east_slavic.xml +++ b/java/res/xml-sw600dp/rows_east_slavic.xml @@ -56,8 +56,8 @@ latin:keyboardLayout="@xml/rowkeys_east_slavic3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <include - latin:keyboardLayout="@xml/key_smiley" + <Key + latin:keyStyle="shiftKeyStyle" latin:keyXPos="-9.0%p" latin:keyWidth="fillRight" /> </Row> diff --git a/java/res/xml-sw600dp/rows_farsi.xml b/java/res/xml-sw600dp/rows_farsi.xml index 75800420a..3b39b0af8 100644 --- a/java/res/xml-sw600dp/rows_farsi.xml +++ b/java/res/xml-sw600dp/rows_farsi.xml @@ -52,9 +52,9 @@ latin:keyboardLayout="@xml/rowkeys_farsi3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <include - latin:keyboardLayout="@xml/key_smiley" - latin:keyXPos="-9.0%p" + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyXPos="-10.0%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_georgian.xml b/java/res/xml-sw600dp/rows_georgian.xml index d4c39af45..2e166bd62 100644 --- a/java/res/xml-sw600dp/rows_georgian.xml +++ b/java/res/xml-sw600dp/rows_georgian.xml @@ -53,8 +53,8 @@ latin:keyboardLayout="@xml/rowkeys_georgian3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <include - latin:keyboardLayout="@xml/key_smiley" + <Key + latin:keyStyle="shiftKeyStyle" latin:keyXPos="-9.0%p" latin:keyWidth="fillRight" /> </Row> diff --git a/java/res/xml-sw600dp/rows_greek.xml b/java/res/xml-sw600dp/rows_greek.xml index 8314222c3..85d5c8a23 100644 --- a/java/res/xml-sw600dp/rows_greek.xml +++ b/java/res/xml-sw600dp/rows_greek.xml @@ -55,8 +55,8 @@ latin:keyboardLayout="@xml/rowkeys_greek3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <include - latin:keyboardLayout="@xml/key_smiley" + <Key + latin:keyStyle="shiftKeyStyle" latin:keyXPos="-9.0%p" latin:keyWidth="fillRight" /> </Row> diff --git a/java/res/xml-sw600dp/rows_hebrew.xml b/java/res/xml-sw600dp/rows_hebrew.xml index 521473f63..55ce69aa5 100644 --- a/java/res/xml-sw600dp/rows_hebrew.xml +++ b/java/res/xml-sw600dp/rows_hebrew.xml @@ -52,10 +52,6 @@ <include latin:keyboardLayout="@xml/rowkeys_hebrew3" latin:keyXPos="10.0%p" /> - <include - latin:keyboardLayout="@xml/key_smiley" - latin:keyXPos="-8.5%p" - latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/row_hebrew4" /> diff --git a/java/res/xml-sw600dp/rows_hindi.xml b/java/res/xml-sw600dp/rows_hindi.xml index f46c1debb..c26439faa 100644 --- a/java/res/xml-sw600dp/rows_hindi.xml +++ b/java/res/xml-sw600dp/rows_hindi.xml @@ -53,8 +53,8 @@ latin:keyboardLayout="@xml/rowkeys_hindi3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <include - latin:keyboardLayout="@xml/key_smiley" + <Key + latin:keyStyle="shiftKeyStyle" latin:keyXPos="-7.5%p" latin:keyWidth="fillRight" /> </Row> diff --git a/java/res/xml-sw600dp/rows_nordic.xml b/java/res/xml-sw600dp/rows_nordic.xml index 57104fa7d..4cc10d031 100644 --- a/java/res/xml-sw600dp/rows_nordic.xml +++ b/java/res/xml-sw600dp/rows_nordic.xml @@ -53,9 +53,9 @@ latin:keyboardLayout="@xml/rowkeys_qwerty3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <include - latin:keyboardLayout="@xml/key_smiley" - latin:keyXPos="-7.6%p" + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyXPos="-10.0%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_number_normal.xml b/java/res/xml-sw600dp/rows_number_normal.xml index 04d295336..3954b000e 100644 --- a/java/res/xml-sw600dp/rows_number_normal.xml +++ b/java/res/xml-sw600dp/rows_number_normal.xml @@ -22,25 +22,22 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Row> - <!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> - <Spacer - latin:keyWidth="12.75%p" /> <Key latin:keyLabel="-" latin:keyStyle="numKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> <Key latin:keyLabel="+" latin:keyStyle="numKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> <Key latin:keyLabel="." latin:keyStyle="numKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> <Key latin:keyLabel="1" latin:keyStyle="numKeyStyle" - latin:keyXPos="42.25%p" /> + latin:keyXPos="31%p" /> <Key latin:keyLabel="2" latin:keyStyle="numKeyStyle" /> @@ -49,20 +46,17 @@ latin:keyStyle="numKeyStyle" /> <Key latin:keyStyle="deleteKeyStyle" - latin:keyXPos="-11.00%p" + latin:keyXPos="-14%p" latin:keyWidth="fillRight" /> </Row> <Row> - <!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> - <Spacer - latin:keyWidth="12.75%p" /> <Key latin:keyStyle="numStarKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> <Key latin:keyLabel="/" latin:keyStyle="numKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> <switch> <case latin:mode="time|datetime" @@ -72,19 +66,19 @@ latin:keyLabelFlags="hasPopupHint" latin:moreKeys="!text/more_keys_for_am_pm" latin:keyStyle="numKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> </case> <default> <Key latin:keyLabel="," latin:keyStyle="numKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> </default> </switch> <Key latin:keyLabel="4" latin:keyStyle="numKeyStyle" - latin:keyXPos="42.25%p" /> + latin:keyXPos="31%p" /> <Key latin:keyLabel="5" latin:keyStyle="numKeyStyle" /> @@ -93,21 +87,18 @@ latin:keyStyle="numKeyStyle" /> <Key latin:keyStyle="enterKeyStyle" - latin:keyXPos="-11.00%p" + latin:keyXPos="-14%p" latin:keyWidth="fillRight" /> </Row> <Row> - <!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> - <Spacer - latin:keyWidth="12.75%p" /> <Key latin:keyLabel="(" latin:keyStyle="numKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> <Key latin:keyLabel=")" latin:keyStyle="numKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> <switch> <case latin:mode="time|datetime" @@ -115,19 +106,19 @@ <Key latin:keyLabel=":" latin:keyStyle="numKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> </case> <default> <Key latin:keyLabel="=" latin:keyStyle="numKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> </default> </switch> <Key latin:keyLabel="7" latin:keyStyle="numKeyStyle" - latin:keyXPos="42.25%p" /> + latin:keyXPos="31%p" /> <Key latin:keyLabel="8" latin:keyStyle="numKeyStyle" /> @@ -139,15 +130,11 @@ </Row> <Row> <Key - latin:keyStyle="numTabKeyStyle" - latin:keyWidth="11.00%p" /> - <Key latin:keyStyle="spaceKeyStyle" - latin:keyWidth="27.75%p" - latin:keyXPos="12.75%p" /> + latin:keyWidth="30%p" /> <Key latin:keyStyle="numStarKeyStyle" - latin:keyXPos="42.25%p" /> + latin:keyXPos="31%p" /> <Key latin:keyLabel="0" latin:keyStyle="numKeyStyle" /> @@ -155,7 +142,7 @@ latin:keyLabel="#" latin:keyStyle="numKeyStyle" /> <include - latin:keyXPos="-11.0%p" + latin:keyXPos="-10%p" latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> diff --git a/java/res/xml-sw600dp/rows_number_password.xml b/java/res/xml-sw600dp/rows_number_password.xml index 2a2c33d93..36f4bba46 100644 --- a/java/res/xml-sw600dp/rows_number_password.xml +++ b/java/res/xml-sw600dp/rows_number_password.xml @@ -24,7 +24,7 @@ <Row> <!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> <Spacer - latin:keyWidth="27.50%p" /> + latin:keyWidth="23%p" /> <Key latin:keyStyle="num1KeyStyle" /> <Key @@ -33,13 +33,13 @@ latin:keyStyle="num3KeyStyle" /> <Key latin:keyStyle="deleteKeyStyle" - latin:keyXPos="-11.00%p" + latin:keyXPos="-16%p" latin:keyWidth="fillRight" /> </Row> <Row> <!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> <Spacer - latin:keyWidth="27.50%p" /> + latin:keyWidth="23%p" /> <Key latin:keyStyle="num4KeyStyle" /> <Key @@ -48,13 +48,13 @@ latin:keyStyle="num6KeyStyle" /> <Key latin:keyStyle="enterKeyStyle" - latin:keyXPos="-11.00%p" + latin:keyXPos="-16%p" latin:keyWidth="fillRight" /> </Row> <Row> <!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> <Spacer - latin:keyWidth="27.50%p" /> + latin:keyWidth="23%p" /> <Key latin:keyStyle="num7KeyStyle" /> <Key @@ -65,14 +65,13 @@ <Spacer /> </Row> <Row> + <!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> + <Spacer + latin:keyWidth="41%p" /> <Key - latin:keyStyle="tabKeyStyle" - latin:keyWidth="11.00%p" /> - <Key - latin:keyStyle="num0KeyStyle" - latin:keyXPos="42.50%p"/> + latin:keyStyle="num0KeyStyle" /> <include - latin:keyXPos="-11.00%p" + latin:keyXPos="-10%p" latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> diff --git a/java/res/xml-sw600dp/rows_pcqwerty.xml b/java/res/xml-sw600dp/rows_pcqwerty.xml index ff2f785ea..0c74114fd 100644 --- a/java/res/xml-sw600dp/rows_pcqwerty.xml +++ b/java/res/xml-sw600dp/rows_pcqwerty.xml @@ -62,9 +62,9 @@ latin:keyWidth="15.0%p" /> <include latin:keyboardLayout="@xml/rowkeys_pcqwerty4" /> - <include - latin:keyboardLayout="@xml/key_smiley" - latin:keyXPos="-9.0%p" + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyXPos="-15.0%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_pcqwerty_symbols.xml b/java/res/xml-sw600dp/rows_pcqwerty_symbols.xml index 046bce909..dd8df4e09 100644 --- a/java/res/xml-sw600dp/rows_pcqwerty_symbols.xml +++ b/java/res/xml-sw600dp/rows_pcqwerty_symbols.xml @@ -61,10 +61,6 @@ <include latin:keyboardLayout="@xml/rowkeys_pcqwerty4" latin:keyXPos="15.0%p" /> - <include - latin:keyboardLayout="@xml/key_smiley" - latin:keyXPos="-9.0%p" - latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/row_pcqwerty5" /> diff --git a/java/res/xml-sw600dp/rows_phone.xml b/java/res/xml-sw600dp/rows_phone.xml index 687cadb87..113ce1fa6 100644 --- a/java/res/xml-sw600dp/rows_phone.xml +++ b/java/res/xml-sw600dp/rows_phone.xml @@ -26,79 +26,69 @@ <include latin:keyboardLayout="@xml/key_styles_number" /> <Row> - <!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> - <Spacer - latin:keyWidth="12.75%p" /> <Key latin:keyLabel="-" latin:keyStyle="numKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> <Key latin:keyLabel="+" latin:keyStyle="numKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> <Key latin:keyStyle="numPauseKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> <Key latin:keyStyle="num1KeyStyle" - latin:keyXPos="42.25%p" /> + latin:keyXPos="31%p" /> <Key latin:keyStyle="num2KeyStyle" /> <Key latin:keyStyle="num3KeyStyle" /> <Key latin:keyStyle="deleteKeyStyle" - latin:keyXPos="-11.00%p" + latin:keyXPos="-14%p" latin:keyWidth="fillRight" /> </Row> <Row> - <!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> - <Spacer - latin:keyWidth="12.75%p" /> <Key latin:keyLabel="," latin:keyStyle="numKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> <Key latin:keyLabel="." latin:keyStyle="numKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> <Key latin:keyStyle="numWaitKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> <Key latin:keyStyle="num4KeyStyle" - latin:keyXPos="42.25%p" /> + latin:keyXPos="31%p" /> <Key latin:keyStyle="num5KeyStyle" /> <Key latin:keyStyle="num6KeyStyle" /> <Key latin:keyStyle="enterKeyStyle" - latin:keyXPos="-11.00%p" + latin:keyXPos="-14%p" latin:keyWidth="fillRight" /> </Row> <Row> - <!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> - <Spacer - latin:keyWidth="12.75%p" /> <Key latin:keyLabel="(" latin:keyStyle="numKeyStyle" - latin:keyWidth="9.25%p" - latin:keyXPos="12.75%p" /> + latin:keyWidth="10%p" /> <Key latin:keyLabel=")" latin:keyStyle="numKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> <Key latin:keyLabel="N" latin:keyStyle="numKeyStyle" - latin:keyWidth="9.25%p" /> + latin:keyWidth="10%p" /> <Key latin:keyStyle="num7KeyStyle" - latin:keyXPos="42.25%p" /> + latin:keyXPos="31%p" /> <Key latin:keyStyle="num8KeyStyle" /> <Key @@ -108,22 +98,18 @@ </Row> <Row> <Key - latin:keyStyle="numTabKeyStyle" - latin:keyWidth="11.00%p" /> - <Key latin:keyStyle="spaceKeyStyle" - latin:keyWidth="27.75%p" - latin:keyXPos="12.75%p" /> + latin:keyWidth="30%p" /> <Key latin:keyStyle="numStarKeyStyle" - latin:keyXPos="42.25%p" /> + latin:keyXPos="31%p" /> <Key latin:keyStyle="num0KeyStyle" /> <Key latin:keyLabel="#" latin:keyStyle="numKeyStyle" /> <include - latin:keyXPos="-11.0%p" + latin:keyXPos="-10%p" latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> diff --git a/java/res/xml-sw600dp/rows_qwerty.xml b/java/res/xml-sw600dp/rows_qwerty.xml index 8e8d5acb6..9fc0e12b8 100644 --- a/java/res/xml-sw600dp/rows_qwerty.xml +++ b/java/res/xml-sw600dp/rows_qwerty.xml @@ -53,8 +53,8 @@ latin:keyboardLayout="@xml/rowkeys_qwerty3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <include - latin:keyboardLayout="@xml/key_smiley" + <Key + latin:keyStyle="shiftKeyStyle" latin:keyXPos="-9.0%p" latin:keyWidth="fillRight" /> </Row> diff --git a/java/res/xml-sw600dp/rows_qwertz.xml b/java/res/xml-sw600dp/rows_qwertz.xml index d8f5bc6c7..de86444e5 100644 --- a/java/res/xml-sw600dp/rows_qwertz.xml +++ b/java/res/xml-sw600dp/rows_qwertz.xml @@ -53,8 +53,8 @@ latin:keyboardLayout="@xml/rowkeys_qwertz3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <include - latin:keyboardLayout="@xml/key_smiley" + <Key + latin:keyStyle="shiftKeyStyle" latin:keyXPos="-9.0%p" latin:keyWidth="fillRight" /> </Row> diff --git a/java/res/xml-sw600dp/rows_south_slavic.xml b/java/res/xml-sw600dp/rows_south_slavic.xml index 8636cbb24..80eea6d43 100644 --- a/java/res/xml-sw600dp/rows_south_slavic.xml +++ b/java/res/xml-sw600dp/rows_south_slavic.xml @@ -53,8 +53,8 @@ latin:keyboardLayout="@xml/rowkeys_south_slavic3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <include - latin:keyboardLayout="@xml/key_smiley" + <Key + latin:keyStyle="shiftKeyStyle" latin:keyXPos="-9.0%p" latin:keyWidth="fillRight" /> </Row> diff --git a/java/res/xml-sw600dp/rows_spanish.xml b/java/res/xml-sw600dp/rows_spanish.xml index 9451e42d7..6aef1d781 100644 --- a/java/res/xml-sw600dp/rows_spanish.xml +++ b/java/res/xml-sw600dp/rows_spanish.xml @@ -53,9 +53,9 @@ latin:keyboardLayout="@xml/rowkeys_qwerty3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <include - latin:keyboardLayout="@xml/key_smiley" - latin:keyXPos="-8.5%p" + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyXPos="-10.0%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_thai.xml b/java/res/xml-sw600dp/rows_thai.xml index d4eaa10bb..fea1bafd1 100644 --- a/java/res/xml-sw600dp/rows_thai.xml +++ b/java/res/xml-sw600dp/rows_thai.xml @@ -57,9 +57,9 @@ latin:keyWidth="10.0%p" /> <include latin:keyboardLayout="@xml/rowkeys_thai4" /> - <include - latin:keyboardLayout="@xml/key_smiley" - latin:keyXPos="-9.0%p" + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyXPos="-10.0%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw768dp/key_styles_common.xml b/java/res/xml-sw768dp/key_styles_common.xml index 2577e1651..2cae0d2ab 100644 --- a/java/res/xml-sw768dp/key_styles_common.xml +++ b/java/res/xml-sw768dp/key_styles_common.xml @@ -74,6 +74,12 @@ <include latin:keyboardLayout="@xml/key_styles_enter" /> <key-style + latin:styleName="defaultActionKeyStyle" + latin:code="!code/key_action_enter" + latin:keyIcon="!icon/undefined" + latin:backgroundType="functional" + latin:parentStyle="defaultEnterKeyStyle" /> + <key-style latin:styleName="spaceKeyStyle" latin:code="!code/key_space" latin:keyActionFlags="noKeyPreview" /> diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java index 0d78c39f2..4d7fe3d8e 100644 --- a/java/src/com/android/inputmethod/keyboard/Key.java +++ b/java/src/com/android/inputmethod/keyboard/Key.java @@ -33,12 +33,10 @@ import android.util.Xml; import com.android.inputmethod.keyboard.internal.KeySpecParser; import com.android.inputmethod.keyboard.internal.KeySpecParser.MoreKeySpec; -import com.android.inputmethod.keyboard.internal.KeyStyles; import com.android.inputmethod.keyboard.internal.KeyStyles.KeyStyle; import com.android.inputmethod.keyboard.internal.KeyboardIconsSet; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.StringUtils; -import com.android.inputmethod.latin.XmlParseUtils; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -201,7 +199,6 @@ public class Key { */ public Key(Resources res, Keyboard.Params params, Keyboard.Builder.Row row, XmlPullParser parser) throws XmlPullParserException { - final KeyStyles keyStyles = params.mKeyStyles; final float horizontalGap = isSpacer() ? 0 : params.mHorizontalGap; final int keyHeight = row.mRowHeight; mVerticalGap = params.mVerticalGap; @@ -210,17 +207,7 @@ public class Key { final TypedArray keyAttr = res.obtainAttributes(Xml.asAttributeSet(parser), R.styleable.Keyboard_Key); - final KeyStyle style; - if (keyAttr.hasValue(R.styleable.Keyboard_Key_keyStyle)) { - String styleName = keyAttr.getString(R.styleable.Keyboard_Key_keyStyle); - style = keyStyles.getKeyStyle(styleName); - if (style == null) { - throw new XmlParseUtils.ParseException("Unknown key style: " + styleName, parser); - } - } else { - style = keyStyles.getEmptyKeyStyle(); - } - + final KeyStyle style = params.mKeyStyles.getKeyStyle(keyAttr, parser); final float keyXPos = row.getKeyX(keyAttr); final float keyWidth = row.getKeyWidth(keyAttr, keyXPos); final int keyYPos = row.getKeyY(); diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java index 4a9135310..0d2e9f0ad 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java @@ -659,7 +659,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { hintX = keyWidth - params.mKeyShiftedLetterHintPadding - getCharWidth(KEY_LABEL_REFERENCE_CHAR, paint) / 2; paint.getFontMetrics(mFontMetrics); - hintY = -mFontMetrics.top + params.mKeyShiftedLetterHintPadding; + hintY = -mFontMetrics.top; paint.setTextAlign(Align.CENTER); } else { // key.hasHintLetter() // The hint letter is placed at top-right corner of the key. Used mainly on phone. diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyStyles.java b/java/src/com/android/inputmethod/keyboard/internal/KeyStyles.java index b32172ebe..80f4f259b 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyStyles.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyStyles.java @@ -32,24 +32,19 @@ public class KeyStyles { private static final String TAG = KeyStyles.class.getSimpleName(); private static final boolean DEBUG = false; - private final HashMap<String, DeclaredKeyStyle> mStyles = - new HashMap<String, DeclaredKeyStyle>(); + final HashMap<String, KeyStyle> mStyles = new HashMap<String, KeyStyle>(); - private final KeyboardTextsSet mTextsSet; + final KeyboardTextsSet mTextsSet; private final KeyStyle mEmptyKeyStyle; + private static final String EMPTY_STYLE_NAME = "<empty>"; public KeyStyles(KeyboardTextsSet textsSet) { mTextsSet = textsSet; - mEmptyKeyStyle = new EmptyKeyStyle(textsSet); + mEmptyKeyStyle = new EmptyKeyStyle(); + mStyles.put(EMPTY_STYLE_NAME, mEmptyKeyStyle); } - public static abstract class KeyStyle { - protected final KeyboardTextsSet mTextsSet; - - public KeyStyle(KeyboardTextsSet textsSet) { - mTextsSet = textsSet; - } - + public abstract class KeyStyle { public abstract String[] getStringArray(TypedArray a, int index); public abstract String getString(TypedArray a, int index); public abstract int getInt(TypedArray a, int index, int defaultValue); @@ -70,11 +65,7 @@ public class KeyStyles { } } - private static class EmptyKeyStyle extends KeyStyle { - public EmptyKeyStyle(KeyboardTextsSet textsSet) { - super(textsSet); - } - + class EmptyKeyStyle extends KeyStyle { @Override public String[] getStringArray(TypedArray a, int index) { return parseStringArray(a, index); @@ -96,11 +87,12 @@ public class KeyStyles { } } - private static class DeclaredKeyStyle extends KeyStyle { + private class DeclaredKeyStyle extends KeyStyle { + private final String mParentStyleName; private final HashMap<Integer, Object> mStyleAttributes = new HashMap<Integer, Object>(); - public DeclaredKeyStyle(KeyboardTextsSet textsSet) { - super(textsSet); + public DeclaredKeyStyle(String parentStyleName) { + mParentStyleName = parentStyleName; } @Override @@ -108,7 +100,11 @@ public class KeyStyles { if (a.hasValue(index)) { return parseStringArray(a, index); } - return (String[])mStyleAttributes.get(index); + if (mStyleAttributes.containsKey(index)) { + return (String[])mStyleAttributes.get(index); + } + final KeyStyle parentStyle = mStyles.get(mParentStyleName); + return parentStyle.getStringArray(a, index); } @Override @@ -116,7 +112,11 @@ public class KeyStyles { if (a.hasValue(index)) { return parseString(a, index); } - return (String)mStyleAttributes.get(index); + if (mStyleAttributes.containsKey(index)) { + return (String)mStyleAttributes.get(index); + } + final KeyStyle parentStyle = mStyles.get(mParentStyleName); + return parentStyle.getString(a, index); } @Override @@ -124,15 +124,21 @@ public class KeyStyles { if (a.hasValue(index)) { return a.getInt(index, defaultValue); } - final Integer styleValue = (Integer)mStyleAttributes.get(index); - return styleValue != null ? styleValue : defaultValue; + if (mStyleAttributes.containsKey(index)) { + return (Integer)mStyleAttributes.get(index); + } + final KeyStyle parentStyle = mStyles.get(mParentStyleName); + return parentStyle.getInt(a, index, defaultValue); } @Override public int getFlag(TypedArray a, int index) { - final int value = a.getInt(index, 0); - final Integer styleValue = (Integer)mStyleAttributes.get(index); - return (styleValue != null ? styleValue : 0) | value; + int value = a.getInt(index, 0); + if (mStyleAttributes.containsKey(index)) { + value |= (Integer)mStyleAttributes.get(index); + } + final KeyStyle parentStyle = mStyles.get(mParentStyleName); + return value | parentStyle.getFlag(a, index); } void readKeyAttributes(TypedArray keyAttr) { @@ -177,10 +183,6 @@ public class KeyStyles { mStyleAttributes.put(index, parseStringArray(a, index)); } } - - void addParentStyleAttributes(DeclaredKeyStyle parentStyle) { - mStyleAttributes.putAll(parentStyle.mStyleAttributes); - } } public void parseKeyStyleAttributes(TypedArray keyStyleAttr, TypedArray keyAttrs, @@ -195,26 +197,28 @@ public class KeyStyles { } } - final DeclaredKeyStyle style = new DeclaredKeyStyle(mTextsSet); + String parentStyleName = EMPTY_STYLE_NAME; if (keyStyleAttr.hasValue(R.styleable.Keyboard_KeyStyle_parentStyle)) { - final String parentStyle = keyStyleAttr.getString( - R.styleable.Keyboard_KeyStyle_parentStyle); - final DeclaredKeyStyle parent = mStyles.get(parentStyle); - if (parent == null) { + parentStyleName = keyStyleAttr.getString(R.styleable.Keyboard_KeyStyle_parentStyle); + if (!mStyles.containsKey(parentStyleName)) { throw new XmlParseUtils.ParseException( - "Unknown parentStyle " + parentStyle, parser); + "Unknown parentStyle " + parentStyleName, parser); } - style.addParentStyleAttributes(parent); } + final DeclaredKeyStyle style = new DeclaredKeyStyle(parentStyleName); style.readKeyAttributes(keyAttrs); mStyles.put(styleName, style); } - public KeyStyle getKeyStyle(String styleName) { + public KeyStyle getKeyStyle(TypedArray keyAttr, XmlPullParser parser) + throws XmlParseUtils.ParseException { + if (!keyAttr.hasValue(R.styleable.Keyboard_Key_keyStyle)) { + return mEmptyKeyStyle; + } + final String styleName = keyAttr.getString(R.styleable.Keyboard_Key_keyStyle); + if (!mStyles.containsKey(styleName)) { + throw new XmlParseUtils.ParseException("Unknown key style: " + styleName, parser); + } return mStyles.get(styleName); } - - public KeyStyle getEmptyKeyStyle() { - return mEmptyKeyStyle; - } } diff --git a/java/src/com/android/inputmethod/latin/ImfUtils.java b/java/src/com/android/inputmethod/latin/ImfUtils.java index af46a02c0..36f6d8ba0 100644 --- a/java/src/com/android/inputmethod/latin/ImfUtils.java +++ b/java/src/com/android/inputmethod/latin/ImfUtils.java @@ -63,7 +63,8 @@ public class ImfUtils { return getInputMethodInfoOfThisIme(context).getId(); } - public static boolean checkIfSubtypeBelongsToThisIme(Context context, InputMethodSubtype ims) { + public static boolean checkIfSubtypeBelongsToThisImeAndEnabled(Context context, + InputMethodSubtype ims) { final InputMethodInfo myImi = getInputMethodInfoOfThisIme(context); final InputMethodManager imm = getInputMethodManager(context); // TODO: Cache all subtypes of this IME for optimization @@ -76,6 +77,19 @@ public class ImfUtils { return false; } + public static boolean checkIfSubtypeBelongsToThisIme(Context context, + InputMethodSubtype ims) { + final InputMethodInfo myImi = getInputMethodInfoOfThisIme(context); + final int count = myImi.getSubtypeCount(); + for (int i = 0; i < count; i++) { + final InputMethodSubtype subtype = myImi.getSubtypeAt(i); + if (subtype.equals(ims)) { + return true; + } + } + return false; + } + public static boolean hasMultipleEnabledIMEsOrSubtypes(Context context, final boolean shouldIncludeAuxiliarySubtypes) { final InputMethodManager imm = getInputMethodManager(context); diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index c6381180c..7efdef987 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1148,8 +1148,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen final IBinder token = getWindow().getWindow().getAttributes().token; if (mShouldSwitchToLastSubtype) { final InputMethodSubtype lastSubtype = mImm.getLastInputMethodSubtype(); - final boolean lastSubtypeBelongsToThisIme = ImfUtils.checkIfSubtypeBelongsToThisIme( - this, lastSubtype); + final boolean lastSubtypeBelongsToThisIme = + ImfUtils.checkIfSubtypeBelongsToThisImeAndEnabled(this, lastSubtype); if ((includesOtherImes || lastSubtypeBelongsToThisIme) && mImm.switchToLastInputMethod(token)) { mShouldSwitchToLastSubtype = false; diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java index 7cbee4f71..112bde6a3 100644 --- a/java/src/com/android/inputmethod/latin/Suggest.java +++ b/java/src/com/android/inputmethod/latin/Suggest.java @@ -385,6 +385,7 @@ public class Suggest implements Dictionary.WordCallback { } // Don't auto-correct words with multiple capital letter autoCorrectionAvailable &= !wordComposer.isMostlyCaps(); + autoCorrectionAvailable &= !wordComposer.isResumed(); if (allowsToBeAutoCorrected && suggestionsList.size() > 1 && mAutoCorrectionThreshold > 0 && Suggest.shouldBlockAutoCorrectionBySafetyNet(typedWord, suggestionsList.get(1).mWord)) { diff --git a/java/src/com/android/inputmethod/latin/WordComposer.java b/java/src/com/android/inputmethod/latin/WordComposer.java index bd8532ebd..e27a546c5 100644 --- a/java/src/com/android/inputmethod/latin/WordComposer.java +++ b/java/src/com/android/inputmethod/latin/WordComposer.java @@ -38,6 +38,7 @@ public class WordComposer { private int[] mYCoordinates; private StringBuilder mTypedWord; private CharSequence mAutoCorrection; + private boolean mIsResumed; // Cache these values for performance private int mCapsCount; @@ -57,6 +58,7 @@ public class WordComposer { mYCoordinates = new int[N]; mAutoCorrection = null; mTrailingSingleQuotesCount = 0; + mIsResumed = false; refreshSize(); } @@ -73,6 +75,7 @@ public class WordComposer { mIsFirstCharCapitalized = source.mIsFirstCharCapitalized; mAutoCapitalized = source.mAutoCapitalized; mTrailingSingleQuotesCount = source.mTrailingSingleQuotesCount; + mIsResumed = source.mIsResumed; refreshSize(); } @@ -85,6 +88,7 @@ public class WordComposer { mCapsCount = 0; mIsFirstCharCapitalized = false; mTrailingSingleQuotesCount = 0; + mIsResumed = false; refreshSize(); } @@ -193,6 +197,7 @@ public class WordComposer { int codePoint = Character.codePointAt(word, i); addKeyInfo(codePoint, keyboard); } + mIsResumed = true; } /** @@ -299,6 +304,13 @@ public class WordComposer { return mAutoCorrection; } + /** + * @return whether we started composing this word by resuming suggestion on an existing string + */ + public boolean isResumed() { + return mIsResumed; + } + // `type' should be one of the LastComposedWord.COMMIT_TYPE_* constants above. public LastComposedWord commitWord(final int type, final String committedWord, final int separatorCode) { @@ -320,6 +332,7 @@ public class WordComposer { mTypedWord.setLength(0); refreshSize(); mAutoCorrection = null; + mIsResumed = false; return lastComposedWord; } @@ -331,5 +344,6 @@ public class WordComposer { mTypedWord.append(lastComposedWord.mTypedWord); refreshSize(); mAutoCorrection = null; // This will be filled by the next call to updateSuggestion. + mIsResumed = true; } } |