diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 258f7cec5..6d05012e6 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -212,39 +212,72 @@
     <!-- Description for keyboard theme switcher -->
     <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 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 English (United Kingdom) keyboard subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_en_GB_keyboard">English (UK) Keyboard</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 Spanish (United States) keyboard subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_es_US_keyboard">Spanish (US) 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 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 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 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 (Australia) voice input subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_en_AU_voice">English (Australia) Voice</string>
+    <!-- Description for English (United Kingdom) voice input subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_en_GB_voice">English (UK) Voice</string>
+    <!-- Description for English (India) voice input subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_en_IN_voice">English (India) Voice</string>
+    <!-- Description for English (New Zealand) voice input subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_en_NZ_voice">English (New Zealand) Voice</string>
+    <!-- Description for English (United States) voice input subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_en_US_voice">English (US) 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 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 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 (China, Simplified) voice input subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_zh_CN_voice">Chinese (China, Simplified) Voice</string>
+    <!-- Description for Chinese (Taiwan, Traditional) voice input subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_zh_TW_voice">Chinese (Taiwan, Traditional) Voice</string>
 
     <!-- Title of an option for usability study mode -->