am 0c3cc878: am 18c4317b: Show correct A2DP connection status in Bluetooth settings.

* commit '0c3cc878586ef1caa3ac5a13a719dd9924cc0d1b':
  Show correct A2DP connection status in Bluetooth settings.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 59b562d..1a6aea3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -511,7 +511,7 @@
         </receiver>
 
         <activity android:name="Settings$UserDictionarySettingsActivity"
-                android:label="@string/user_dict_settings_titlebar"
+                android:label="@string/user_dict_settings_title"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter>
@@ -531,7 +531,7 @@
         </activity>
 
         <activity android:name=".inputmethod.UserDictionaryAddWordActivity"
-                  android:label="@string/user_dict_settings_titlebar"
+                  android:label="@string/user_dict_settings_title"
                   android:theme="@android:style/Theme.Holo.Dialog.NoActionBar"
                   android:windowSoftInputMode="stateVisible"
                   android:noHistory="true"
@@ -546,7 +546,7 @@
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="UserDictionarySettings"
-                android:label="@string/user_dict_settings_titlebar"
+                android:label="@string/user_dict_settings_title"
                 android:exported="true"
                 android:targetActivity="Settings$UserDictionarySettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 772b5f4..1802431 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Programme moet toestemming versoek om SD-kaart te lees"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Beskerm SD-kaart?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wanneer die SD-kaart beskerm word, moet programme toestemming versoek om data vanuit eksterne berging te lees."\n\n"Sommige programme werk dalk nie totdat dit deur hul ontwikkelaars opgedateer word."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Plaaslike terminaal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktiveer terminaalprogram wat plaaslike skermtoegang bied"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Kies apparaat"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Kies legstuk"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Skep legstuk en laat toegang toe?"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index bab3dfb..cd13e0c 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"መተግበሪያዎች የSD ካርድ እንዲያነቡ ፍቃድ መጠየቅ አለባቸው"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"የSD ካርድ ይጠበቅ?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"የSD ካርድ የተጠበቀ ሲሆን መተግበሪያዎች ከውጫዊ ማከማቻ ውሂብ እንዲያነቡ ፍቃድ መጠየቅ አለባቸው።"\n\n"አንዳንድ መተግበሪያዎች በገንቢዎቻቸው እስኪዘመኑ ድረስ ላይሰሩ ይችላሉ።"</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"አካባቢያዊ ተርሚናል"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"የአካባቢያዊ ሼል መዳረሻ የሚያቀርብ የተርሚናል መተግበሪያ አንቃ"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"መሣሪያ ምረጥ"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"ፍርግም ምረጥ"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"አዲስ ምግብር ፍጠር አና መዳረሻ ፍቀድለት?"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 8f088c2..4aa1a0e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"يجب على التطبيقات طلب الإذن لقراءة بطاقة SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"هل تريد حماية بطاقة SD؟"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"إذا كانت بطاقة SD محمية، يجب على التطبيقات طلب إذن لقراءة البيانات من وحدة التخزين الخارجية."\n\n"ربما لن تعمل بعض التطبيقات إلى أن يحدثها مطورو برامجها."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"تطبيق طرفي محلي"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"تمكين تطبيق طرفي يوفر إمكانية الدخول إلى واجهة النظام المحلية"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"اختيار أداة"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"اختيار أداة"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"هل تريد إنشاء الأداة والسماح بالوصول؟"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index d88fb9c..4ae3459 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Прыкладанні павінны запытваць дазвол на чытанне SD-карты"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Абараніць SD-карту?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Калі SD-карта абаронена, прыкладанні павінны запытваць дазвол на чытанне дадзеных са знешняй памяці."\n\n"Некаторыя прыкладанні могуць не працаваць, пакуль не будуць абноўлены распрацоўшчыкамі."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Лакальны тэрмінал"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Уключэнне прыкладання тэрмінала, якое прапануе доступ да лакальнай абалонкі"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Выберыце гаджэт"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Выберыце віджэт"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Стварыць віджэт і дазволіць доступ?"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 3dc5f03..99b07f1 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Прилож. трябва да поискат разрешение за четене на SD картата"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Да се защити ли SD картата?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Когато SD картата е защитена, приложенията трябва да поискат разрешение за четене на данни от външното хранилище."\n\n"Някои от тях може да не работят, докато не бъдат актуализирани от съответните програмисти."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Локален терминал"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Актив. на прил. за терминал с достъп до локалния команден ред"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Избор на притурка"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Избор на приспособление"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Да се създаде ли приспособлението и да се разреши ли достъп?"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 02cadad..2d1c697 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -153,12 +153,12 @@
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Sempre"</item>
-    <item msgid="844721238536786870">"Només quan està endollat"</item>
+    <item msgid="844721238536786870">"Només quan s\'estigui carregant"</item>
     <item msgid="2990218920631468642">"Mai (augmenta l\'ús de dades)"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Sempre"</item>
-    <item msgid="7433294150916905997">"Només quan està endollat"</item>
+    <item msgid="7433294150916905997">"Només quan s\'estigui carregant"</item>
     <item msgid="1390404486722375028">"Mai"</item>
   </string-array>
   <string-array name="wifi_frequency_band_entries">
@@ -200,7 +200,7 @@
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Desactivat"</item>
     <item msgid="3165868966179561687">"Alerta"</item>
-    <item msgid="6038758039030476855">"Vibra"</item>
+    <item msgid="6038758039030476855">"Vibració"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Cap"</item>
@@ -354,12 +354,12 @@
     <item msgid="3191973083884253830">"Cap"</item>
     <item msgid="9089630089455370183">"Logcat"</item>
     <item msgid="5397807424362304288">"Systrace (gràfics)"</item>
-    <item msgid="1340692776955662664">"Pila de trucades de glGetError"</item>
+    <item msgid="1340692776955662664">"Pila de trucades a glGetError"</item>
   </string-array>
   <string-array name="show_non_rect_clip_entries">
     <item msgid="993742912147090253">"Desactivada"</item>
-    <item msgid="675719912558941285">"Pintar blava regió retall no rect."</item>
-    <item msgid="1064373276095698656">"Dest. ordres dibuix provad. en verd"</item>
+    <item msgid="675719912558941285">"Àrea retall no rectangular en blau"</item>
+    <item msgid="1064373276095698656">"Ressalta ordres de dibuix provats en verd"</item>
   </string-array>
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Desactivat"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 1dcde66..b756eaa 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Les aplicacions han de sol·licitar permís per llegir la targeta SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vols protegir la targeta SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Si la targeta SD està protegida, les aplicacions han de sol·licitar permís per llegir les dades de l\'emmagatzematge extern."\n\n"És possible que algunes aplicacions no funcionin fins que els desenvolupadors no les actualitzin."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Activa l\'aplicació de terminal que ofereix accés al shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Selecció de gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Selecció de widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vols crear el widget i permetre l\'accés?"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 96f680b..35a2166 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikace musejí před čtením z karty SD žádat o povolení"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Chránit kartu SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Pokud je karta SD chráněná, musejí aplikace před čtením dat z externího úložiště požádat o povolení."\n\n"Některé aplikace nemusejí fungovat, dokud je vývojáři neaktualizují."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Místní terminál"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktivovat terminálovou apl. pro místní přístup k prostředí shell"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Zvolte gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Zvolte widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vytvořit widget a povolit přístup?"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 39e1ff9..edf8536 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apps skal anmode om tilladelse til at læse SD-kortet"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vil du beskytte SD-kortet?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Når SD-kortet er beskyttet, skal apps anmode om tilladelse til at læse data fra et eksternt lager."\n\n"Nogle apps fungerer muligvis ikke, før de opdateres af deres udviklere."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokal terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktivér terminalappen, der giver lokal shell-adgang"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Vælg gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Vælg widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vil du oprette en widget og tillade adgang?"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 35c46ab..a414881 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1319,6 +1319,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apps benötigen die Berechtigung zum Lesen der SD-Karte"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD-Karte schützen?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wenn die SD-Karte geschützt ist, benötigen Apps die Berechtigung zum Lesen von Daten aus dem externen Speicher."\n\n"Einige Apps funktionieren eventuell erst nach der Aktualisierung durch ihre Entwickler."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokales Terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Terminal-App mit Zugriff auf lokale Shell aktivieren"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Gadget auswählen"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Widget auswählen"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widget erstellen und Zugriff erlauben?"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index a5cbf5d..800040b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Οι εφαρμογές πρέπει να ζητούν άδεια για την ανάγνωση κάρτας SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Να προστατεύεται η κάρτα SD;"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Όταν μια κάρτα SD προστατεύεται, οι εφαρμογές πρέπει να ζητούν άδεια για την ανάγνωση δεδομένων από τον εξωτερικό χώρο αποθήκευσης."\n\n"Ορισμένες εφαρμογές ενδέχεται να μην λειτουργούν μέχρι να ενημερωθούν από τους προγραμματιστές τους."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Τοπική τερματική εφαρμογή"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Ενεργοπ.τερμ.εφαρμογής που προσφέρει πρόσβαση στο τοπικό κέλυφος"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Επιλογή gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Επιλογή γραφικού στοιχείου"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Να γίνει δημιουργία γραφικού στοιχείου και να επιτρέπεται η πρόσβαση;"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index eceef6c..e09b2ab 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apps must request permission to read SD card"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protect SD card?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"When SD card is protected, apps must request permission to read data from external storage."\n\n"Some apps may not work until updated by their developers."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Local terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Enable terminal app that offers local shell access"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Choose gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Choose widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Create widget and allow access?"</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index ce76840..b1d7655 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -72,7 +72,7 @@
     <item msgid="7553665153391107454">"Rápido"</item>
     <item msgid="1370673569131070146">"A mayor velocidad"</item>
     <item msgid="4648206845228970803">"A velocidad muy alta"</item>
-    <item msgid="4977949754169483251">"Rápido"</item>
+    <item msgid="4977949754169483251">"Veloz"</item>
     <item msgid="6106302964845503577">"Muy rápido"</item>
     <item msgid="6800277205640837264">"A velocidad máxima"</item>
   </string-array>
@@ -369,7 +369,7 @@
   </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límite estándar"</item>
-    <item msgid="4071574792028999443">"No hay procesos de fondo."</item>
+    <item msgid="4071574792028999443">"Ningún proceso en 2do plano"</item>
     <item msgid="4810006996171705398">"Máximo 1 proceso"</item>
     <item msgid="8586370216857360863">"Máximo 2 procesos"</item>
     <item msgid="836593137872605381">"Máximo 3 procesos"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ae171a9..33f3e33 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Las aplicaciones deben pedir permiso para leer la tarjeta SD."</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"¿Proteger tarjeta SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Cuando la tarjeta SD está protegida, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo."\n\n"Es posible que algunas aplicaciones no funcionen hasta que los programadores las actualicen."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Habilitar aplicac. de terminal que ofrece acceso al shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Elegir gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Elegir control"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"¿Deseas crear el widget y permitir el acceso?"</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index fe1cf2e..98ec894 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -72,9 +72,9 @@
     <item msgid="7553665153391107454">"Rápida"</item>
     <item msgid="1370673569131070146">"Más rápida"</item>
     <item msgid="4648206845228970803">"Muy rápida"</item>
-    <item msgid="4977949754169483251">"Rápida"</item>
-    <item msgid="6106302964845503577">"Muy rápida"</item>
-    <item msgid="6800277205640837264">"La más rápida"</item>
+    <item msgid="4977949754169483251">"Superrápida"</item>
+    <item msgid="6106302964845503577">"Hiperrrápida"</item>
+    <item msgid="6800277205640837264">"Lo más rápido posible"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Muy bajo"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b966d62..3f340d9 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Las aplicaciones deben solicitar permiso para leer la tarjeta SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"¿Proteger tarjeta SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Cuando la tarjeta SD está protegida, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo."\n\n"Es posible que algunas aplicaciones no funcionen hasta que los desarrolladores las actualicen."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Habilitar aplicación de terminal que ofrece acceso a shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Seleccionar gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Seleccionar widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"¿Crear widget y permitir acceso?"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index acc5006..419b95a 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Rakendused peavad SD-kaardi lugemiseks loa taotlema"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Kas kaitsta SD-kaarti?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kui SD-kaart on kaitstud, peavad rakendused välismäluseadmelt andmete lugemiseks loa taotlema."\n\n"Mõned rakendused ei pruugi töötada enne, kui arendaja on need värskendanud."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Kohalik terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Luba kohalikku turvalist juurdepääsu pakkuv terminalirakendus"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Valige vidin"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Valige vidin"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Kas luua vidin ja lubada juurdepääs?"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 76de88b..97ba48c 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -191,7 +191,7 @@
   </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
-    <item msgid="628395202971532382">"آمار"</item>
+    <item msgid="628395202971532382">"ثابت"</item>
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"هیچکدام"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c7e111b..1583382 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"برنامه باید برای خواندن کارت SD اجازه بگیرد"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"کارت SD حفاظت شود؟"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"وقتی کارت SD محافظت شده است٬ برنامه‌ها باید اجازه بگیرند تا داده‌های حافظه خارجی را بخوانند."\n\n"برخی از برنامه‌ها ممکن است تا توسط برنامه‌نویسان خود به‌روزرسانی نشوند کار نکنند."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"ترمینال محلی"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"فعال کردن ترمینال برنامه‌ کاربردی که دسترسی به برنامه محلی را پیشنهاد می‌کند"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"انتخاب اسبابک"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"انتخاب ابزارک"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"آیا مایل به ایجاد ابزارک و دادن اجازهٔ دسترسی هستید؟"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 806e268..d09f866 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Sovellusten on pyydettävä lupa SD-kortin lukemiseen"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Suojataanko SD-kortti?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jos SD-kortti on suojattu, sovellusten on pyydettävä lupa ulkoisen tallennustilan käyttämiseen."\n\n"Jotkin sovellukset toimivat vasta, kun kehittäjät päivittävät ne."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Paikallinen pääte"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Ota käyttöön päätesov. joka mahdollistaa paikall. liittymäkäytön"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Valitse gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Valitse widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Luo widget ja salli käyttö?"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 212d051..1f2a3de 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Les applications doivent demander autorisation de lire carte SD."</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protéger la carte SD ?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Lorsque la carte SD est protégée, les applications doivent demander l\'autorisation de lire les données de la mémoire de stockage externe."\n\n"Certaines applications peuvent ne pas fonctionner jusqu\'à ce que leurs développeurs les mettent à jour."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Activer l\'application Terminal permettant l\'accès au shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Choisir un gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Choisir un widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Créer un widget et autoriser l\'accès ?"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 76474d1..145462e 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"SD कार्ड पढ़ने के लिए एप्‍लिकेशन को अनुमति का अनुरोध करना होगा"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD कार्ड सुरक्षित करें?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD कार्ड के सुरक्षित होने पर, एप्‍लिकेशन को बाहरी संग्रहण से डेटा पढ़ने की अनुमति का अनुरोध करना होगा."\n\n"हो सकता है कुछ एप्‍लिकेशन उनके डेवलपर द्वारा अपडेट नहीं किए जाने तक कार्य न करें."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"स्थानीय टर्मिनल"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"स्थानीय शेल एक्सेस ऑफ़र करने वाला टर्मिनल एप्लिकेशन सक्षम करें"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"गैजेट चुनें"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"विजेट चुनें"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"विजेट बनाएं और पहुंच की अनुमति दें?"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 18c8bf4..4da811d 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikacije moraju tražiti dozvolu za čitanje SD kartice"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Zaštititi SD karticu?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kad je SD kartica zaštićena, aplikacije moraju tražiti dozvolu za čitanje podataka s vanjske pohrane."\n\n"Neke aplikacije možda neće raditi dok ih razvojni programeri ne ažuriraju."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokalni terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Omogući aplikaciju terminala koja nudi pristup lokalnoj ovojnici"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Odaberi gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Odaberite widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Želite izraditi widget i dozvoliti pristup?"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 8bee04b..c1df52f 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Az alkalmazások kérjenek engedélyt az SD-kártya olvasására"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Védetté teszi az SD-kártyát?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Ha az SD-kártya védett, az alkalmazásoknak engedélyt kell kérniük a külső tárhelyen tárolt adatok olvasására."\n\n"Előfordulhat, hogy egyes alkalmazások nem működnek addig, amíg a fejlesztők nem frissítik azokat."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Helyi végpont"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Végalkalmazás engedélyezése a helyi rendszerhéj eléréséhez"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Modul kiválasztása"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Modul kiválasztása"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Létrehozza a modult, és engedélyezi a hozzáférést?"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index cff694c..fafda8d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikasi harus meminta izin untuk membaca kartu SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Lindungi kartu SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jika kartu SD dilindungi, aplikasi harus meminta izin untuk membaca data dari penyimpanan eksternal."\n\n"Beberapa aplikasi mungkin tidak berfungsi sebelum diperbarui oleh pengembangnya."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal lokal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktifkan aplikasi terminal yang menawarkan akses kerangka lokal"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Pilih gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Pilih widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Buat widget dan izinkan akses?"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ce5f949..155df36 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Le app devono richiedere l\'autorizzazione per leggere la scheda SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Proteggere la scheda SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando la scheda SD è protetta, le applicazioni devono richiedere l\'autorizzazione per leggere i dati dalla memoria esterna."\n\n"Alcune applicazioni potrebbero non funzionare fino all\'aggiornamento da parte dei relativi sviluppatori."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminale locale"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Abilita l\'app Terminale che offre l\'accesso alla shell locale"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Scegli gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Scegli widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Creare il widget e consentire l\'accesso?"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 4dca075..f5b2697 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"על יישומים לבקש רשות כדי לקרוא כרטיס SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"האם להגן על כרטיס ה-SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"כאשר כרטיס ה-SD מוגן, על יישומים לבקש רשות כדי לקרוא נתונים מאחסון חיצוני."\n\n"ייתכן שיישומים מסוימים לא יפעלו עד שיעודכנו על ידי המפתחים שלהם."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"מסוף מקומי"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"הפעל יישום מסוף המציע גישה מקומית למעטפת"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"בחר גאדג\'ט"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"בחר Widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"האם ליצור Widget‏ ולאפשר גישה?"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 0f8dd56..eb07396 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1320,6 +1320,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"アプリによるSDカードの読み取り権限のリクエストが必要"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SDカードの保護"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SDカードが保護されている場合、アプリは外部ストレージからデータを読み取る権限をリクエストする必要があります。"\n\n"一部のアプリについては、デベロッパーによって更新されるまで動作しない可能性があります。"</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"ローカルターミナル"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"ローカルシェルアクセスを提供するターミナルアプリを有効にします"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"ガジェットを選択"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"ウィジェットを選択"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"ウィジェットの作成とアクセスの許可"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index abedf76..6b79411 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"SD카드를 읽으려면 앱이 권한을 요청해야함"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD 카드를 보호하시겠습니까?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD 카드를 보호하도록 설정한 경우 앱이 외부 저장소에서 데이터를 읽을 수 있는 권한을 요청해야 합니다."\n\n"일부 앱은 개발자가 업데이트할 때까지 작동하지 않을 수 있습니다."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"로컬 터미널"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"로컬 셸 액세스를 제공하는 터미널 앱 사용"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"가젯 선택"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"위젯 선택"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"위젯을 만들고 액세스를 허용하시겠습니까?"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index d4febb3..da03ba4 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Programos turi prašyti leidimo skaityti SD kortelę"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Apsaugoti SD kortelę?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jei SD kortelė yra apsaugota, programos turi prašyti leidimo skaityti išorinėje atmintinėje esančius duomenis."\n\n"Kai kurios programos gali neveikti, kol jų neatnaujins kūrėjai."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Vietinis terminalas"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Įgal. terminalo progr., siūlančią prieigą prie viet. apvalkalo"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Pasirinkti programėlę"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Pasirinkti valdiklį"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Sukurti valdiklį ir leisti prieigą?"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index e9e6aad..eab5127 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Lietotnēm ir jāpieprasa atļauja lasīt SD karti."</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vai aizsargāt SD karti?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Ja SD karte ir aizsargāta, lietotnēm ir jāpieprasa atļauja lasīt datus no ārējas atmiņas."\n\n"Dažas lietotnes, iespējams, nedarbosies, kamēr tās neatjauninās izstrādātāji."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Vietējā beigu lietotne"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Iespējot beigu lietotni, kurā piedāvāta vietējā čaulas piekļuve"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Izvēlēties sīkrīku"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Izvēlēties logrīku"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vai izveidot logrīku un atļaut piekļuvi?"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index ccd6275..5d3a651 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apl mesti meminta kebenaran untuk membaca kad SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Lindungi kad SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Apabila kad SD dilindungi, apl mesti meminta kebenaran untuk membaca data dari storan luaran."\n\n"Sesetengah apl mungkin tidak berfungsi sehingga dikemas kini oleh pemaju apl itu."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal setempat"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Dayakan apl terminal yang menawarkan akses shell tempatan"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Pilih alat"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Pilih widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Buat widget dan benarkan akses?"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 328409e..edd4590 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apper må be om tillatelse til å lese SD-kort"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vil du beskytte SD-kortet?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Når SD-kortet er beskyttet, må apper be om tillatelse til å lese data fra ekstern lagring."\n\n"Enkelte apper fungerer ikke før utviklerne har oppdatert dem."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokal terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktiver terminalappen som gir lokal kommandolistetilgang"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Velg gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Velg skrivebordselement"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vil du opprette modulen og gi tilgang?"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 261766f..78c91f6 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apps moeten toestemming vragen om de SD-kaart te lezen"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD-kaart beveiligen?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wanneer de SD-kaart is beveiligd, moeten apps toestemming vragen om gegevens op externe opslagmedia te lezen."\n\n"Sommige apps werken mogelijk pas nadat ze zijn bijgewerkt door hun ontwikkelaars."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokale terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Terminal-app inschakelen die lokale shell-toegang biedt"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Gadget kiezen"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Widget kiezen"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widget maken en toegang toestaan?"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 1a10173..babcad6 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -357,12 +357,12 @@
     <item msgid="1340692776955662664">"Stos wywołań funkcji glGetError"</item>
   </string-array>
   <string-array name="show_non_rect_clip_entries">
-    <item msgid="993742912147090253">"Wył."</item>
+    <item msgid="993742912147090253">"Wyłączone"</item>
     <item msgid="675719912558941285">"Rysuj nieprostokątny region przycinania na niebiesko"</item>
     <item msgid="1064373276095698656">"Wyróżnij testowane polecenia rysowania na zielono"</item>
   </string-array>
   <string-array name="track_frame_time_entries">
-    <item msgid="2193584639058893150">"Wył."</item>
+    <item msgid="2193584639058893150">"Wyłączone"</item>
     <item msgid="2751513398307949636">"Na ekranie w postaci pasków"</item>
     <item msgid="8272260411216018353">"Na ekranie w postaci linii"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4246ec7..dfa2894 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikacje muszą prosić o pozwolenie na odczyt karty SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Włączyć ochronę karty SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Gdy karta SD jest chroniona, aplikacje muszą prosić o pozwolenie na odczyt danych z tego nośnika zewnętrznego."\n\n"Niektóre aplikacje mogą przestać działać i wymagać aktualizacji przez programistę."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal lokalny"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Włącz terminal, który umożliwia dostęp do powłoki lokalnej"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Wybierz gadżet"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Wybierz widżet"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Utworzyć widżet i zezwolić na dostęp?"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 0f183f9..facbd52 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"As aplicações têm de pedir permissão para ler o cartão SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Proteger cartão SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando o cartão SD estiver protegido, as aplicações têm de pedir permissão para ler os dados do armazenamento externo."\n\n"Algumas aplicações podem não funcionar até serem atualizadas pelos respetivos programadores."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Ativar aplicação terminal que oferece acesso local à shell"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Escolher miniaplicação"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Escolher widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Criar widget e permitir o acesso?"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ccab010..e3473c0 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplicativos precisam de permissão para ler o cartão SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Proteger o cartão SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando o cartão SD está protegido, os aplicativos devem solicitar permissão para ler dados de armazenamento externo."\n\n"Alguns aplicativos podem não funcionar até que sejam atualizados por seus desenvolvedores."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Ativar o aplicativo terminal que oferece acesso ao shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Escolher o gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Escolher widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Criar widget e permitir acesso?"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index e53fa08..cdef446 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -2027,6 +2027,10 @@
     <skip />
     <!-- no translation found for enforce_read_external_confirm_message (3858482712337574407) -->
     <skip />
+    <!-- no translation found for enable_terminal_title (95572094356054120) -->
+    <skip />
+    <!-- no translation found for enable_terminal_summary (67667852659359206) -->
+    <skip />
     <string name="gadget_picker_title" msgid="98374951396755811">"Tscherner in gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Tscherner in widget"</string>
     <!-- no translation found for allow_bind_app_widget_activity_allow_bind_title (2538303018392590627) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index dca6757..f0df3ea 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1319,6 +1319,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplicaţiile trebuie să ceară permisiunea de a citi cardul SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protejaţi cardul SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Când cardul SD este protejat, aplicaţiile trebuie să solicite permisiunea de a citi datele de pe stocarea externă."\n\n"Este posibil ca unele aplicaţii să nu funcţioneze înainte de a fi actualizate de către dezvoltatorii lor."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Aplicație terminal locală"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Activați aplicația terminal care oferă acces la shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Alegeţi obiectul gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Alegeţi obiectul widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Creaţi widgetul şi permiteţi accesul?"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index c63f13d..5ce9513 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -252,7 +252,7 @@
     <item msgid="514615766544675057">"позвонить"</item>
     <item msgid="8181415497109310680">"чтение SMS"</item>
     <item msgid="6816551144382117307">"создание SMS"</item>
-    <item msgid="4600463921908905030">"получение SMS"</item>
+    <item msgid="4600463921908905030">"Получение SMS"</item>
     <item msgid="5958926493289432745">"получение экстренных SMS"</item>
     <item msgid="4945269495221089540">"получение MMS"</item>
     <item msgid="5570472453573929087">"получение сообщений WAP PUSH"</item>
@@ -261,7 +261,7 @@
     <item msgid="587124103118495063">"запись SMS на смарт-карту"</item>
     <item msgid="2320577158869025503">"изменение настроек"</item>
     <item msgid="1545733463471924009">"отображать поверх других элементов"</item>
-    <item msgid="3609046903962454582">"доступ к уведомлениям"</item>
+    <item msgid="3609046903962454582">"Доступ к уведомлениям"</item>
     <item msgid="4671646036128214513">"камера"</item>
     <item msgid="1097324338692486211">"записать аудио"</item>
     <item msgid="5031552983987798163">"воспроизвести аудио"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ebf0bd2..543318c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Запрашивать разрешение для считывания данных с SD-карты"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Защитить SD-карту?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Если SD-карта защищена, приложения должны запрашивать разрешение для считывания данных с нее."\n\n"Некоторые приложения могут не работать. В этом случае дождитесь, пока они не обновятся."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Локальный терминальный доступ"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Разрешить терминальный доступ к локальной оболочке"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Выбор гаджета"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Выберите виджет"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Создать виджет и разрешить доступ?"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index fb354ce..8152272 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikácie musia pred čítaním z karty SD vyžiadať povolenie"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Chrániť kartu SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Keď je karta SD chránená, aplikácie musia pred čítaním údajov z externého úložiska požiadať o povolenie."\n\n"Pri niektorých aplikáciách platí, že budú fungovať až vtedy, keď ich vývojári aktualizujú."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Miestny terminál"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Povoliť terminálovú apl. na miestny prístup k prostrediu shell"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Vyberte modul gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Vyberte miniaplikáciu"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vytvoriť miniaplikáciu a povoliť prístup?"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 58040be..fe462f8 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikacije morajo zahtevati dovoljenje za branje kartice SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Želite zaščititi kartico SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Če je kartica SD zaščitena, morajo aplikacije zahtevati dovoljenje za branje podatkov iz zunanje shrambe."\n\n"Nekatere aplikacije morda ne bodo delovale, dokler jih njihovi razvijalci ne posodobijo."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokalni terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Omogočanje terminalske aplikacije za dostop do lokalne lupine"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Izberi pripomoček"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Izberite pripomoček"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Želite ustvariti pripomoček in dovoliti dostop?"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index cf9d200..d526992 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Апликације морају да захтевају дозволу за читање SD картице"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Желите да заштитите SD картицу?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Када је SD картица заштићена, апликације морају да захтевају дозволу за читање података из спољне меморије."\n\n"Неке апликације можда неће функционисати док их програмери не буду ажурирали."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Локални терминал"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Омогући аплик. терминала за приступ локалном командном окружењу"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Избор гаџета"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Избор виџета"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Желите ли да направите виџет и дозволите приступ?"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a560ba8..dd950f4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Appar måste få tillstånd för att kunna läsa SD-kortet"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vill du skydda SD-kortet?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"När SD-kortet är skyddat måste apparna begära tillstånd för att kunna läsa data som lagras externt."\n\n"En del appar måste eventuellt uppdateras av utvecklaren för att fungera."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokal terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktivera en terminalapp som ger åtkomst till hyllor lokalt"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Välj gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Välj widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Skapa widget och tillåta åtkomst?"</string>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index d7c0c7b..69b3ad6 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -31,7 +31,7 @@
   </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"Sekunde 15"</item>
-    <item msgid="8881760709354815449">"sekunde 30"</item>
+    <item msgid="8881760709354815449">"Sekunde 30"</item>
     <item msgid="7589406073232279088">"Dakika 1"</item>
     <item msgid="7001195990902244174">"Dakika 2"</item>
     <item msgid="7489864775127957179">"Dakika 5"</item>
@@ -41,7 +41,7 @@
   <string-array name="dream_timeout_entries">
     <item msgid="3149294732238283185">"Katu"</item>
     <item msgid="2194151041885903260">"Sekunde 15"</item>
-    <item msgid="5892295237131074341">"sekunde 30"</item>
+    <item msgid="5892295237131074341">"Sekunde 30"</item>
     <item msgid="3538441365970038213">"Dakika 1"</item>
     <item msgid="412343871668955639">"Dakika 2"</item>
     <item msgid="5076853889688991690">"Dakika 5"</item>
@@ -55,7 +55,7 @@
     <item msgid="1822002388249545488">"Sekunde 30"</item>
     <item msgid="8538071621211916519">"Dakika 1"</item>
     <item msgid="5663439580228932882">"Dakika 2"</item>
-    <item msgid="49888496216106852">"dakika 5"</item>
+    <item msgid="49888496216106852">"Dakika 5"</item>
     <item msgid="9002737361305019353">"Dakika 10"</item>
     <item msgid="4322676235684793329">"Dakika 30"</item>
   </string-array>
@@ -141,7 +141,7 @@
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="8151962652413645395">"Dakika 2"</item>
-    <item msgid="8675215713017289017">"dakika 5"</item>
+    <item msgid="8675215713017289017">"Dakika 5"</item>
     <item msgid="477015974247590543">"Saa 1"</item>
     <item msgid="5198271470953124739">"Kamwe muda usiishe"</item>
   </string-array>
@@ -153,12 +153,12 @@
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Daima"</item>
-    <item msgid="844721238536786870">"Wakati imechopekwa ndani"</item>
-    <item msgid="2990218920631468642">"Kamwe ( huongeza utumizi wa data)"</item>
+    <item msgid="844721238536786870">"Wakati inachaji pekee"</item>
+    <item msgid="2990218920631468642">"Kamwe (huongeza matumizi ya data)"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Daima"</item>
-    <item msgid="7433294150916905997">"Wakati imechopekwa ndani"</item>
+    <item msgid="7433294150916905997">"Wakati inachaji pekee"</item>
     <item msgid="1390404486722375028">"kamwe"</item>
   </string-array>
   <string-array name="wifi_frequency_band_entries">
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 0f8f826..b9d4c27 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1310,6 +1310,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Sharti programu iombe ruhusa ili kusoma kadi ya SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Linda kadi ya SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wakati kadi ya SD imelindwa, sharti programu ziombe ruhusa ya kusoma data kutoka kwenye hifadhi ya nje."\n\n"Baadhi ya programu zinawezakosa kufanya kazi hadi zisasishwe na wasanidi wake."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Kituo cha karibu"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Washa programu ya mwisho inayotoa ufikiaji mkuu wa karibu"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Chagua kidude"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Chagua wijeti"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Unda wijeti na uruhusu ufikiaji?"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d826554..3f9a6a0 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"แอปพลิเคชันต้องขออนุญาตในการอ่านการ์ด SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"ปกป้องการ์ด SD หรือไม่"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"เมื่อการ์ด SD ได้รับการปกป้อง แอปพลิเคชันจะต้องขออนุญาตในการอ่านข้อมูลจากที่จัดเก็บข้อมูลภายนอก"\n\n"แอปพลิเคชันบางรายการอาจไม่ทำงานจนกว่าจะได้รับการอัปเดตโดยนักพัฒนาซอฟต์แวร์ของแอปพลิเคชันนั้นๆ"</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"เทอร์มินัลในตัวเครื่อง"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"เปิดใช้งานแอปเทอร์มินัลที่ให้การเข้าถึงเชลล์ในตัวเครื่อง"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"เลือกแกดเจ็ต"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"เลือกวิดเจ็ต"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"สร้างวิดเจ็ตและอนุญาตการเข้าถึงหรือไม่"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 67d8f99..ca91a1b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Dapat na humiling ng pahintulot ang apps na basahin ang SD card"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protektahan ang SD card?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kapag pinoprotektahan ang SD card, dapat na humiling ng pahintulot ang apps na magbasa ng data mula sa panlabas na storage."\n\n"Maaaring hindi gumana ang ilang apps hanggang sa ma-update ng mga developer ng mga ito."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokal na terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Paganahin ang terminal app na nag-aalok ng lokal na shell access"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Pumili ng gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Pumili ng widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Likhain ang widget at payagan ang access?"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index fb162d7..2b826ea 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Uygulamalar SD kartı okumak için izin istemelidir"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD kart korunsun mu?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD kart korumalı olduğunda, uygulamaların harici depolama biriminden veri okumak için izin istemeleri gerekir."\n\n"Bazı uygulamalar, geliştiricileri tarafından güncellenene kadar çalışmayabilir."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Yerel terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Yerel kabuk erişimi sunan terminal uygulamasını etkinleştir"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Gadget seç"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Widget seç"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widget\'ı oluşturup erişime izin vermek istiyor musunuz?"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 43c1414..1113797 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Програми мають запитувати дозвіл на читання карти SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Захистити карту SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Якщо карту SD захищено, програми мають запитувати дозвіл на читання даних із зовнішньої пам’яті."\n\n"Деякі програми можуть не працювати до оновлення своїми розробниками."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Локальний термінал"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Увімк. програму-термінал, що надає локальний доступ до оболонки"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Вибрати віджет"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Вибрати віджет"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Створити віджет і дозволити доступ?"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a440235..ac03fcf 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Các ứng dụng phải yêu cầu quyền đọc thẻ SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Bảo vệ thẻ SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Khi thẻ SD được bảo vệ, các ứng dụng phải yêu cầu quyền đọc dữ liệu từ bộ nhớ ngoài."\n\n"Một số ứng dụng có thể không hoạt động cho đến khi được nhà phát triển cập nhật."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Dòng lệnh cục bộ"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Bật ứng dụng dòng lệnh cung cấp quyền truy cập vỏ cục bộ"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Chọn tiện ích"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Chọn tiện ích"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Tạo tiện ích và cho phép truy cập?"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 122297c..c8ae9f1 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"应用必须申请读取 SD 卡的权限"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"要对 SD 卡进行读写保护吗?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"如果 SD 卡受到读写保护,则应用必须申请相关权限才能读取外部存储设备中的数据。"\n\n"某些应用需要其开发者更新之后才能正常使用。"</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"本地终端"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"启用终端应用,以便在本地访问 Shell"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"选择小工具"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"选择小部件"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"是否允许该应用创建并访问小部件?"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a348b56..9c29e6f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1318,6 +1318,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"應用程式必須取得權限,才能讀取 SD 卡"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"保護 SD 卡?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD 卡受到保護時,應用程式必須取得權限,才能從外部儲存裝置讀取資料。"\n\n"部分應用程式可能需由開發人員更新,才能正常運作。"</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"本機終端機"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"啟用可提供本機命令介面存取權的終端機應用程式"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"選擇小工具"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"選擇小工具"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"是否要建立小工具並允許存取?"</string>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 605e32d..00f602d 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -30,8 +30,8 @@
     <item msgid="8392017019801393511">"Konke"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"amasekhondi angu-15"</item>
-    <item msgid="8881760709354815449">"amasekhondi angu-30"</item>
+    <item msgid="3342301044271143016">"15 amasekhondi"</item>
+    <item msgid="8881760709354815449">"30 amasekhondi"</item>
     <item msgid="7589406073232279088">"1 iminithi"</item>
     <item msgid="7001195990902244174">"2 amaminithi"</item>
     <item msgid="7489864775127957179">"amaminithii angu-5"</item>
@@ -50,9 +50,9 @@
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"Ngokushesha"</item>
-    <item msgid="6736512735606834431">"amasekhondi angu-5"</item>
-    <item msgid="8044619388267891375">"amasekhondi angu-15"</item>
-    <item msgid="1822002388249545488">"amasekhondi angu-30"</item>
+    <item msgid="6736512735606834431">"5 amasekhondi"</item>
+    <item msgid="8044619388267891375">"15 amasekhondi"</item>
+    <item msgid="1822002388249545488">"30 amasekhondi"</item>
     <item msgid="8538071621211916519">"1 iminithi"</item>
     <item msgid="5663439580228932882">"2 amaminithi"</item>
     <item msgid="49888496216106852">"5 amaminithi"</item>
@@ -142,7 +142,7 @@
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="8151962652413645395">"2 amaminithi"</item>
     <item msgid="8675215713017289017">"amaminithii angu-5"</item>
-    <item msgid="477015974247590543">"ihora elingu-1"</item>
+    <item msgid="477015974247590543">"1 ihora"</item>
     <item msgid="5198271470953124739">"Ayiphelelwa isikhathi"</item>
   </string-array>
   <string-array name="wifi_signal">
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 0c14bd9..cc48876 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1325,6 +1325,8 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Izinhlelo zokusebenza kufanele zicele imvume yokufunda ikhadi le-SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vikela ikhadi le-SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Uma ikhadi le-SD livikelekile, izinhlelo zokusebenza kufanele zicele imvume yokufunda idatha ngesilondolozi sangaphandle."\n\n"Ezinye izinhlelo zokusebenza zingahle zingasebenzi zize zibuyekezwe onjiniyela bazo."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Itheminali yasendaweni"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Nika amandla uhlelo lokusebenza letheminali olunikeza ukufinyelela kwasendaweni kwe-shell"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Khetha igajethi"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Khetha iwijethi"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Yenza iwijethi bese uvumela ukufinyeleleka?"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1466ca6..23dcf5b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2929,13 +2929,9 @@
     <string name="keyboard_layout_picker_title">Keyboard layouts</string>
 
     <!-- User dictionary settings --><skip />
-    <!-- User dictionary settings, The titlebar text of the User dictionary settings screen. -->
-    <string name="user_dict_settings_titlebar">User dictionary</string>
-    <!-- User dictionary settings, The title of the list item to go into the User dictionary settings screen when there is only one user dictionary. [CHAR LIMIT=35] -->
-    <string name="user_dict_single_settings_title">Personal dictionary</string>
-    <!-- User dictionary settings, The title of the list item to go into the User dictionary list when there are several user dictionaries. [CHAR LIMIT=35] -->
-    <string name="user_dict_multiple_settings_title">Personal dictionaries</string>
-    <!-- User dictionary settings.  The summary of the listem item to go into the User dictionary settings screen. -->
+    <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
+    <string name="user_dict_settings_title">Personal dictionary</string>
+    <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
     <string name="user_dict_settings_summary">""</string>
     <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
     <string name="user_dict_settings_add_menu_title">Add</string>
@@ -3098,6 +3094,11 @@
     <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
     <string name="enforce_read_external_confirm_message" product="default">When SD card is protected, apps must request permission to read data from external storage.\n\nSome apps may not work until updated by their developers.</string>
 
+    <!-- Title of checkbox setting that enables the terminal app. [CHAR LIMIT=32] -->
+    <string name="enable_terminal_title">Local terminal</string>
+    <!-- Summary of checkbox setting that enables the terminal app. [CHAR LIMIT=64] -->
+    <string name="enable_terminal_summary">Enable terminal app that offers local shell access</string>
+
     <!-- Title for the screen that lets the user choose a gadget to add to the home screen
          (or other screens that can host gadgets).  Note to translators: we're still determining
          the final name for Gadgets/Widgets, so please translate both for now. -->
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 72b73bb..3d1383a 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -61,6 +61,11 @@
                 android:title="@string/clear_adb_keys" />
 
         <CheckBoxPreference
+            android:key="enable_terminal"
+            android:title="@string/enable_terminal_title"
+            android:summary="@string/enable_terminal_summary" />
+
+        <CheckBoxPreference
             android:key="bugreport_in_power"
             android:title="@string/bugreport_in_power"
             android:summary="@string/bugreport_in_power_summary"/>
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index f001486..3e7fdb5 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -29,7 +29,8 @@
 
     <!-- User dictionary preference title and fragment will be set programmatically. -->
     <PreferenceScreen
-            android:key="key_user_dictionary_settings" />
+            android:key="key_user_dictionary_settings"
+            android:title="@string/user_dict_settings_title" />
 
     <PreferenceCategory android:key="keyboard_settings_category"
             android:title="@string/keyboard_settings_category">
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index a4438d0..bd802cf 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -348,6 +348,15 @@
         // Global gesture.
         mGlobalGesturePreferenceScreen =
                 (PreferenceScreen) findPreference(ENABLE_ACCESSIBILITY_GESTURE_PREFERENCE_SCREEN);
+        final int longPressOnPowerBehavior = getActivity().getResources().getInteger(
+                com.android.internal.R.integer.config_longPressOnPowerBehavior);
+        final int LONG_PRESS_POWER_GLOBAL_ACTIONS = 1;
+        if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
+                || longPressOnPowerBehavior != LONG_PRESS_POWER_GLOBAL_ACTIONS) {
+            // Remove accessibility shortcut if power key is not present
+            // nor long press power does not show global actions menu.
+            mSystemsCategory.removePreference(mGlobalGesturePreferenceScreen);
+        }
     }
 
     private void updateAllPreferences() {
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 4597bf0..07b2e59 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -34,6 +34,7 @@
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.hardware.usb.IUsbManager;
 import android.os.AsyncTask;
@@ -91,6 +92,7 @@
 
     private static final String ENABLE_ADB = "enable_adb";
     private static final String CLEAR_ADB_KEYS = "clear_adb_keys";
+    private static final String ENABLE_TERMINAL = "enable_terminal";
     private static final String KEEP_SCREEN_ON = "keep_screen_on";
     private static final String ALLOW_MOCK_LOCATION = "allow_mock_location";
     private static final String HDCP_CHECKING_KEY = "hdcp_checking";
@@ -141,6 +143,8 @@
 
     private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
 
+    private static final String TERMINAL_APP_PACKAGE = "com.android.terminal";
+
     private static final int RESULT_DEBUG_APP = 1000;
 
     private IWindowManager mWindowManager;
@@ -154,6 +158,7 @@
 
     private CheckBoxPreference mEnableAdb;
     private Preference mClearAdbKeys;
+    private CheckBoxPreference mEnableTerminal;
     private Preference mBugreport;
     private CheckBoxPreference mBugreportInPower;
     private CheckBoxPreference mKeepScreenOn;
@@ -223,15 +228,21 @@
 
         addPreferencesFromResource(R.xml.development_prefs);
 
+        final PreferenceGroup debugDebuggingCategory = (PreferenceGroup)
+                findPreference(DEBUG_DEBUGGING_CATEGORY_KEY);
+
         mEnableAdb = findAndInitCheckboxPref(ENABLE_ADB);
         mClearAdbKeys = findPreference(CLEAR_ADB_KEYS);
         if (!SystemProperties.getBoolean("ro.adb.secure", false)) {
-            PreferenceGroup debugDebuggingCategory = (PreferenceGroup)
-                    findPreference(DEBUG_DEBUGGING_CATEGORY_KEY);
             if (debugDebuggingCategory != null) {
                 debugDebuggingCategory.removePreference(mClearAdbKeys);
             }
         }
+        mEnableTerminal = findAndInitCheckboxPref(ENABLE_TERMINAL);
+        if (!isPackageInstalled(getActivity(), TERMINAL_APP_PACKAGE)) {
+            debugDebuggingCategory.removePreference(mEnableTerminal);
+            mEnableTerminal = null;
+        }
 
         mBugreport = findPreference(BUGREPORT);
         mBugreportInPower = findAndInitCheckboxPref(BUGREPORT_IN_POWER_KEY);
@@ -244,6 +255,7 @@
         if (!android.os.Process.myUserHandle().equals(UserHandle.OWNER)) {
             disableForUser(mEnableAdb);
             disableForUser(mClearAdbKeys);
+            disableForUser(mEnableTerminal);
             disableForUser(mPassword);
         }
 
@@ -252,8 +264,6 @@
         mWaitForDebugger = findAndInitCheckboxPref(WAIT_FOR_DEBUGGER_KEY);
         mVerifyAppsOverUsb = findAndInitCheckboxPref(VERIFY_APPS_OVER_USB_KEY);
         if (!showVerifierSetting()) {
-            PreferenceGroup debugDebuggingCategory = (PreferenceGroup)
-                    findPreference(DEBUG_DEBUGGING_CATEGORY_KEY);
             if (debugDebuggingCategory != null) {
                 debugDebuggingCategory.removePreference(mVerifyAppsOverUsb);
             } else {
@@ -443,6 +453,11 @@
         mHaveDebugSettings = false;
         updateCheckBox(mEnableAdb, Settings.Global.getInt(cr,
                 Settings.Global.ADB_ENABLED, 0) != 0);
+        if (mEnableTerminal != null) {
+            updateCheckBox(mEnableTerminal,
+                    context.getPackageManager().getApplicationEnabledSetting(TERMINAL_APP_PACKAGE)
+                    == PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
+        }
         updateCheckBox(mBugreportInPower, Settings.Secure.getInt(cr,
                 Settings.Secure.BUGREPORT_IN_POWER_MENU, 0) != 0);
         updateCheckBox(mKeepScreenOn, Settings.Global.getInt(cr,
@@ -1087,6 +1102,11 @@
                         .setPositiveButton(android.R.string.ok, this)
                         .setNegativeButton(android.R.string.cancel, null)
                         .show();
+        } else if (preference == mEnableTerminal) {
+            final PackageManager pm = getActivity().getPackageManager();
+            pm.setApplicationEnabledSetting(TERMINAL_APP_PACKAGE,
+                    mEnableTerminal.isChecked() ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                            : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
         } else if (preference == mBugreportInPower) {
             Settings.Secure.putInt(getActivity().getContentResolver(),
                     Settings.Secure.BUGREPORT_IN_POWER_MENU, 
@@ -1343,4 +1363,12 @@
             throw new RuntimeException("Problem talking with PackageManager", e);
         }
     }
+
+    private static boolean isPackageInstalled(Context context, String packageName) {
+        try {
+            return context.getPackageManager().getPackageInfo(packageName, 0) != null;
+        } catch (NameNotFoundException e) {
+            return false;
+        }
+    }
 }
diff --git a/src/com/android/settings/KeyguardAppWidgetPickActivity.java b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
index 8e08019..f3db2ca 100644
--- a/src/com/android/settings/KeyguardAppWidgetPickActivity.java
+++ b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
@@ -517,8 +517,8 @@
                     // Found in KeyguardHostView.java
                     final int KEYGUARD_HOST_ID = 0x4B455947;
                     int userId = ActivityManager.getCurrentUser();
-                    mAppWidgetId = AppWidgetHost.allocateAppWidgetIdForSystem(KEYGUARD_HOST_ID,
-                            userId);
+                    mAppWidgetId = AppWidgetHost.allocateAppWidgetIdForPackage(KEYGUARD_HOST_ID,
+                            userId, "com.android.keyguard");
                 }
                 mAppWidgetManager.bindAppWidgetId(
                         mAppWidgetId, intent.getComponent(), mExtraConfigureOptions);
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 10d9214..b3cdbc9 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -161,6 +161,11 @@
             removePreference(KEY_MOBILE_NETWORK_SETTINGS);
         }
 
+        // Remove Airplane Mode settings if it's a stationary device such as a TV.
+        if (getActivity().getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
+            removePreference(KEY_TOGGLE_AIRPLANE);
+        }
+
         // Enable Proxy selector settings if allowed.
         Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS);
         DevicePolicyManager mDPM = (DevicePolicyManager)
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 2a5adb1..acb0c22 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -199,10 +199,6 @@
             // not present or disabled. In this case we need to remove the preference.
             getPreferenceScreen().removePreference(userDictionaryPreference);
         } else if (localeList.size() <= 1) {
-            final Intent intent =
-                    new Intent(UserDictionaryList.USER_DICTIONARY_SETTINGS_INTENT_ACTION);
-            userDictionaryPreference.setTitle(R.string.user_dict_single_settings_title);
-            userDictionaryPreference.setIntent(intent);
             userDictionaryPreference.setFragment(
                     com.android.settings.UserDictionarySettings.class.getName());
             // If the size of localeList is 0, we don't set the locale parameter in the
@@ -216,7 +212,6 @@
                 userDictionaryPreference.getExtras().putString("locale", locale);
             }
         } else {
-            userDictionaryPreference.setTitle(R.string.user_dict_multiple_settings_title);
             userDictionaryPreference.setFragment(UserDictionaryList.class.getName());
         }
     }