Tidy up the subtype names
Change-Id: I5dbdc6c006fab01fa389f0796b6c87aa2a90132e
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index f88d2df..4cf9303 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -169,4 +169,7 @@
<item>English (UK)</item>
<item>Deutsch (QWERTY)</item>
</string-array>
+
+ <!-- Generic subtype label -->
+ <string name="subtype_generic">%s</string>
</resources>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index b1cb6a7..6c597cf 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -326,89 +326,12 @@
<!-- Title of the item to change the keyboard theme [CHAR LIMIT=20]-->
<string name="keyboard_layout">Keyboard theme</string>
- <!-- Description for Czech keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_cs_keyboard">Czech Keyboard</string>
- <!-- Description for Arabic keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_ar_keyboard">Arabic Keyboard</string>
- <!-- Description for Danish keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_da_keyboard">Danish Keyboard</string>
- <!-- Description for German keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_de_keyboard">German Keyboard</string>
<!-- Description for German QWERTY keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_de_qwerty_keyboard">German QWERTY Keyboard</string>
+ <string name="subtype_de_qwerty">German QWERTY</string>
<!-- Description for English (United Kingdom) keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_en_GB_keyboard">English (UK) Keyboard</string>
+ <string name="subtype_en_GB">English (UK)</string>
<!-- Description for English (United States) keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_en_US_keyboard">English (US) Keyboard</string>
- <!-- Description for Spanish keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_es_keyboard">Spanish Keyboard</string>
- <!-- Description for Finnish keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_fi_keyboard">Finnish Keyboard</string>
- <!-- Description for French keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_fr_keyboard">French Keyboard</string>
- <!-- Description for French (Canada) keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_fr_CA_keyboard">French (Canada) Keyboard</string>
- <!-- Description for French (Switzerland) keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_fr_CH_keyboard">French (Switzerland) Keyboard</string>
- <!-- Description for Croatian keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_hr_keyboard">Croatian Keyboard</string>
- <!-- Description for Hungarian keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_hu_keyboard">Hungarian Keyboard</string>
- <!-- Description for Hebrew keyboard subtype [CHAR LIMIT=35] -->
- <!-- Java uses the deprecated "iw" code instead of the standard "he" code -->
- <string name="subtype_mode_iw_keyboard">Hebrew Keyboard</string>
- <!-- Description for Italian keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_it_keyboard">Italian Keyboard</string>
- <!-- Description for Norwegian keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_nb_keyboard">Norwegian Keyboard</string>
- <!-- Description for Dutch keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_nl_keyboard">Dutch Keyboard</string>
- <!-- Description for Polish keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_pl_keyboard">Polish Keyboard</string>
- <!-- Description for Portuguese keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_pt_keyboard">Portuguese Keyboard</string>
- <!-- Description for Russian keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_ru_keyboard">Russian Keyboard</string>
- <!-- Description for Serbian keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_sr_keyboard">Serbian Keyboard</string>
- <!-- Description for Swedish keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_sv_keyboard">Swedish Keyboard</string>
- <!-- Description for Turkish keyboard subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_tr_keyboard">Turkish Keyboard</string>
- <!-- Description for Afrikaans voice input subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_af_voice">Afrikaans Voice</string>
- <!-- Description for Czech voice input subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_cs_voice">Czech Voice</string>
- <!-- Description for German voice input subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_de_voice">German Voice</string>
- <!-- Description for English voice input subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_en_voice">English Voice</string>
- <!-- Description for Spanish voice input subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_es_voice">Spanish Voice</string>
- <!-- Description for French voice input subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_fr_voice">French Voice</string>
- <!-- Description for Italian voice input subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_it_voice">Italian Voice</string>
- <!-- Description for Japanese voice input subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_ja_voice">Japanese Voice</string>
- <!-- Description for Korean voice input subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_ko_voice">Korean Voice</string>
- <!-- Description for Dutch voice input subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_nl_voice">Dutch Voice</string>
- <!-- Description for Polish voice input subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_pl_voice">Polish Voice</string>
- <!-- Description for Portuguese voice input subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_pt_voice">Portuguese Voice</string>
- <!-- Description for Russian voice input subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_ru_voice">Russian Voice</string>
- <!-- Description for Turkish voice input subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_tr_voice">Turkish Voice</string>
- <!-- Description for Chinese, Yue voice input subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_yue_voice">Chinese, Yue Voice</string>
- <!-- Description for Chinese, Mandarin voice input subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_zh_voice">Chinese, Mandarin Voice</string>
- <!-- Description for isiZulu voice input subtype [CHAR LIMIT=35] -->
- <string name="subtype_mode_zu_voice">isiZulu Voice</string>
+ <string name="subtype_en_US">English (US)</string>
<!-- Title of an option for usability study mode -->
<string name="prefs_usability_study_mode">Usability study mode</string>