diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index 5dae07e..7829596 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -413,6 +413,8 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
                 <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:text="@string/security_settings_premium_sms_desc" />
                 <Spinner
                     android:id="@+id/security_settings_premium_sms_list"
diff --git a/res/layout/regulatory_info.xml b/res/layout/regulatory_info.xml
index dc1efe8..5827557 100755
--- a/res/layout/regulatory_info.xml
+++ b/res/layout/regulatory_info.xml
@@ -13,9 +13,14 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:adjustViewBounds="true"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:scaleType="centerCrop"
-    android:src="@drawable/regulatory_info"/>
+    android:layout_height="wrap_content">
+    <ImageView
+        android:adjustViewBounds="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:scaleType="centerCrop"
+        android:src="@drawable/regulatory_info" />
+</ScrollView>
+
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index c2f6989..384ee86 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -54,7 +54,7 @@
                 android:layout_marginBottom="8dip"
                 android:src="@*android:drawable/ic_menu_moreoverflow_holo_dark"
                 android:background="?android:attr/actionBarItemBackground"
-                android:contentDescription="@string/wifi_menu_wps_pbc" />
+                android:contentDescription="@string/wifi_menu_more_options" />
 
         </LinearLayout>
 
@@ -180,4 +180,4 @@
                 </LinearLayout>
         </RelativeLayout>
     </LinearLayout>
-</view>
\ No newline at end of file
+</view>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 2ba554e..ced8fd4 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1142,10 +1142,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Verander die voorkeur-installeerligging vir nuwe programme."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Deaktiveer ingeboude program?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"As jy \'n ingeboude program deaktiveer, kan ander hulle programme wangedra."</string>
-    <!-- no translation found for app_special_disable_dlg_title (2690148680327142674) -->
-    <skip />
-    <!-- no translation found for app_special_disable_dlg_text (3447657419284854195) -->
-    <skip />
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vee data uit en deaktiveer program?"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"As jy \'n ingeboude program deaktiveer, kan ander programme hulle wangedra. Jou data sal ook uitgevee word."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Wil jy kennisgewings afskakel?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"As jy kennisgewings vir hierdie program afskakel, kan jy moontlik belangrike waarskuwings en opdaterings mis."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Geheuegebruik"</string>
@@ -1661,10 +1659,8 @@
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Skermlaag wys huidige CPU-gebruik"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forseer GPU-lewering"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Dwing gebruik van GPU vir 2D-tekening"</string>
-    <!-- no translation found for force_msaa (7920323238677284387) -->
-    <skip />
-    <!-- no translation found for force_msaa_summary (9123553203895817537) -->
-    <skip />
+    <string name="force_msaa" msgid="7920323238677284387">"Dwing 4x MSAA"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"Aktiveer 4x MSAA in OpenGL ES 2.0-programme"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profiel se GPU-lewering"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"Meet leweringstyd in die adb-dop dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Vensteranimasieskaal"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index e56c344..cc33aec 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1142,10 +1142,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"ለአዲስ መተግበሪያዎች ተመራጭ መጫኛ ሥፍራዎችን ለውጥ።"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"የውስጠ ግንብ መተግበሪያ አቦዝን?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"ውስጠ-ግንቡ የሆኑ መተግበሪያዎችን ካቦዘንክ ሌሎች መተግበሪያዎች አደብ ሊስቱ ይችላሉ::"</string>
-    <!-- no translation found for app_special_disable_dlg_title (2690148680327142674) -->
-    <skip />
-    <!-- no translation found for app_special_disable_dlg_text (3447657419284854195) -->
-    <skip />
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ውሂብ ይሰረዝና መተግበሪያ ይሰናከል?"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"አንድ አብሮ የተሰራን መተግበሪያ ካሰናከሉ ሌሎች መተግበሪያዎች ያልተገባ ባህሪ ሊያሳዩ ይችላሉ። ውሂብዎ እንዲሁም ይሰረዛል።"</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"ማሳወቂያዎችን አጥፋ?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"ለእዚህ መተግበሪያ ማሳወቂያዎችን አጥፍተህ ከሆነ፣ አስፈላጊ ማንቂያዎችን እና አዘምኖችን ልታጣ ትችላለህ።"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"የማከማቻ ጥቅም"</string>
@@ -1661,10 +1659,8 @@
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"የማያ ተደራቢ የአሁኑን የCPU አጠቃቀም  እያሳየ ነው።"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU ምላሽ መስጠትን አስገድድ"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"ለ2-ልኬት መሳል የGPU ስራ አስገድድ"</string>
-    <!-- no translation found for force_msaa (7920323238677284387) -->
-    <skip />
-    <!-- no translation found for force_msaa_summary (9123553203895817537) -->
-    <skip />
+    <string name="force_msaa" msgid="7920323238677284387">"4x MSAA አስገድድ"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"4x MSAA በ OpenGL ES 2.0 መተግበሪያዎች ውስጥ ያንቁ"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"የGPU ምላሽ መስጠት መዝግብ"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"ምላሽ ለመስጠት የወሰደው ጊዜ በadb shell dumpsys gfxinfo ለካ"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"የዊንዶው እነማ ልኬት ለውጥ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 7f322c5..5eba828 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1142,10 +1142,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"تغيير موقع التثبيت المفضل للتطبيقات الجديدة"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"هل تريد تعطيل التطبيق المضمن؟"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"إذا تم تعطيل التطبيق المضمن، فقد تعمل التطبيقات الأخرى بشكل غير صحيح."</string>
-    <!-- no translation found for app_special_disable_dlg_title (2690148680327142674) -->
-    <skip />
-    <!-- no translation found for app_special_disable_dlg_text (3447657419284854195) -->
-    <skip />
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"هل تريد حذف البيانات وتعطيل التطبيق؟"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"عند تعطيل تطبيق مضمن، قد تحدث مشكلات في عمل تطبيقات أخرى. سيتم حذف بياناتك أيضًا."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"هل تريد إيقاف الإشعارات؟"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"إذا كنت قد أجريت إيقافًا للإشعارات حول هذا التطبيق، فقد تفوتك تنبيهات وتحديثات مهمة."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"استخدام وحدة التخزين"</string>
@@ -1661,10 +1659,8 @@
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"عرض تراكب الشاشة لاستخدام CPU الحالي"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"فرض عرض رسومات GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"فرض استخدام وحدة معالجة الرسومات للرسم ثنائي الأبعاد"</string>
-    <!-- no translation found for force_msaa (7920323238677284387) -->
-    <skip />
-    <!-- no translation found for force_msaa_summary (9123553203895817537) -->
-    <skip />
+    <string name="force_msaa" msgid="7920323238677284387">"فرض 4x MSAA"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"تمكين 4x MSAA في تطبيقات OpenGL ES 2.0"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"رسم مخطط لعرض GPU"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"قياس وقت العرض بـ adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"حجم الرسوم المتحركة للنافذة"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4c59588..adec093 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1142,10 +1142,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Canvia la ubicació d\'instal·lació preferida per a les aplicacions noves"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Vols desact. aplic. integr.?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Si desactives una aplicació integrada, és possible que altres aplicacions no funcionin correctament."</string>
-    <!-- no translation found for app_special_disable_dlg_title (2690148680327142674) -->
-    <skip />
-    <!-- no translation found for app_special_disable_dlg_text (3447657419284854195) -->
-    <skip />
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vols suprimir les dades i desactivar l\'aplicació?"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Si desactives una aplicació incorporada, és possible que altres aplicacions no funcionin correctament. Les teves dades també se suprimiran."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vols desactivar les notificacions?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Si desactives les notificacions d\'aquesta aplicació, pots perdre\'t actualitzacions i alertes importants."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Ús d\'emmagatzematge"</string>
@@ -1661,10 +1659,8 @@
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposa l\'ús de la CPU a la pantalla"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Força acceleració GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Força l\'ús de GPU per a dibuixos en 2D"</string>
-    <!-- no translation found for force_msaa (7920323238677284387) -->
-    <skip />
-    <!-- no translation found for force_msaa_summary (9123553203895817537) -->
-    <skip />
+    <string name="force_msaa" msgid="7920323238677284387">"Força MSAA de 4x"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"Activa MSAA  de 4x a les aplicacions OpenGL ES 2.0"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Representació GPU perfil"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"Mesura temps representació a adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Escala d\'animació finestra"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 1f369c1..dac0b2a 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1142,10 +1142,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Αλλαγή της προτιμώμενης θέσης εγκατάστασης για νέες εφαρμογές"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Απενεργ. ενσωματωμ. εφαρμογής;"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Αν απενεργοποιήσετε μια ενσωματωμένη εφαρμογή, ενδέχεται να μην εκτελούνται σωστά κάποιες άλλες εφαρμογές."</string>
-    <!-- no translation found for app_special_disable_dlg_title (2690148680327142674) -->
-    <skip />
-    <!-- no translation found for app_special_disable_dlg_text (3447657419284854195) -->
-    <skip />
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Διαγραφή δεδομένων και απενεργοποίηση εφαρμογής;"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Εάν απενεργοποιήσετε μια ενσωματωμένη εφαρμογή, οι άλλες εφαρμογές ενδέχεται να μην λειτουργούν σωστά. Τα δεδομένα σας θα διαγραφούν επίσης."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Απενεργοποίηση ειδοποιήσεων;"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Εάν απενεργοποιήσετε τις ειδοποιήσεις για αυτήν την εφαρμογή, ενδέχεται να χάσετε σημαντικές ειδοποιήσεις και ενημερώσεις."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Αποθηκευτικός χώρος"</string>
@@ -1661,10 +1659,8 @@
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Επικάλυψη οθόνης για προβολή τρέχουσας χρήσης CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Αναγκαστική απόδοση GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Αναγκαστική χρήση του GPU για σχέδιο 2D"</string>
-    <!-- no translation found for force_msaa (7920323238677284387) -->
-    <skip />
-    <!-- no translation found for force_msaa_summary (9123553203895817537) -->
-    <skip />
+    <string name="force_msaa" msgid="7920323238677284387">"Αναγκαστικά 4x MSAA"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"Ενεργοποίηση 4x MSAA σε εφαρμογές OpenGL ES 2.0"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Απόδοση GPU προφίλ"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"Μέτρ. χρόνου απόδοσης σε adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Κλίμακα κίνησης παραθύρου"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 760dc3a46..f5dca6e 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1142,10 +1142,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Change the preferred installation location for new applications."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Disable built-in app?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"If you disable a built-in app, other apps may misbehave."</string>
-    <!-- no translation found for app_special_disable_dlg_title (2690148680327142674) -->
-    <skip />
-    <!-- no translation found for app_special_disable_dlg_text (3447657419284854195) -->
-    <skip />
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Delete data and disable app?"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"If you disable a built-in app, other apps may misbehave. Your data will also be deleted."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Turn off notifications"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"If you turn off notifications for this app, you may miss important alerts and updates."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Storage use"</string>
@@ -1661,10 +1659,8 @@
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Screen overlay showing current CPU usage"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Force GPU rendering"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Force use of GPU for 2d drawing"</string>
-    <!-- no translation found for force_msaa (7920323238677284387) -->
-    <skip />
-    <!-- no translation found for force_msaa_summary (9123553203895817537) -->
-    <skip />
+    <string name="force_msaa" msgid="7920323238677284387">"Force 4x MSAA"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"Enable 4x MSAA in OpenGL ES 2.0 apps"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profile GPU rendering"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"Measure rendering time in adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Window animation scale"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 479d2a0..91104df 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -20,9 +20,9 @@
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="create" msgid="3578857613172647409">"Crear"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Ahora estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos de ser un desarrollador."</string>
-    <string name="show_dev_on" msgid="1110711554982716293">"Ahora eres un desarrollador."</string>
-    <string name="show_dev_already" msgid="2151632240145446227">"No es necesario, ya eres un desarrollador."</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Ahora estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos de ser un programador."</string>
+    <string name="show_dev_on" msgid="1110711554982716293">"Ahora eres un programador."</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"No es necesario, ya eres un programador."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"CONEXIONES INALÁMBRICAS Y REDES"</string>
     <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIVO"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
@@ -1142,10 +1142,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Cambiar la ubicación de instalación preferida para nuevas aplicaciones"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"¿Inhabilitar aplic. incorp.?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Si inhabilitas una aplicación incorporada, otras aplicaciones podrían funcionar incorrectamente."</string>
-    <!-- no translation found for app_special_disable_dlg_title (2690148680327142674) -->
-    <skip />
-    <!-- no translation found for app_special_disable_dlg_text (3447657419284854195) -->
-    <skip />
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"¿Deseas eliminar los datos e inhabilitar la aplicación?"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Si inhabilitas una aplicación integrada, las otras aplicaciones podrían presentar un mal funcionamiento. También se eliminarán tus datos."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"¿Desactivar notificaciones?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Si desactivas las notificaciones de esta aplicación, es posible que no recibas actualizaciones y alertas importantes."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso del almacenamiento"</string>
@@ -1661,10 +1659,8 @@
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposición de pantalla que muestre el uso actual de la CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forzar representación GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forzar uso de GPU para dibujar en 2d"</string>
-    <!-- no translation found for force_msaa (7920323238677284387) -->
-    <skip />
-    <!-- no translation found for force_msaa_summary (9123553203895817537) -->
-    <skip />
+    <string name="force_msaa" msgid="7920323238677284387">"Force MSAA 4x"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"Habilitar MSAA 4x en aplicaciones OpenGL ES 2.0"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Represent. GPU del perfil"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"Medir tiempo de repr. en adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Ventana de escala de animación"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0884c30..4913b76 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -22,7 +22,7 @@
     <string name="device_info_default" msgid="7847265875578739287">"알 수 없음"</string>
     <string name="show_dev_countdown" msgid="5521163114237004821">"개발자가 되려면 <xliff:g id="STEP_COUNT">%1$d</xliff:g>단계가 남았습니다."</string>
     <string name="show_dev_on" msgid="1110711554982716293">"개발자가 되셨습니다."</string>
-    <string name="show_dev_already" msgid="2151632240145446227">"남은 단계가 없습니다. 개발자가 되셨습니다."</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"이미 개발자입니다."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"무선 및 네트워크"</string>
     <string name="header_category_device" msgid="5781174212691167553">"기기"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"개인 설정"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index ac5f14c..4f3b1b8 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1142,10 +1142,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Tukar lokasi pemasangan pilihan untuk aplikasi baru"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Lumpuhkan aplikasi terbina dalam?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Jika anda melumpuhkan aplikasi terbina-dalam, aplikasi lain mungkin berfungsi secara salah."</string>
-    <!-- no translation found for app_special_disable_dlg_title (2690148680327142674) -->
-    <skip />
-    <!-- no translation found for app_special_disable_dlg_text (3447657419284854195) -->
-    <skip />
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Padam data dan lumpuhkan apl?"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Jika anda melumpuhkan apl terbina dalam, apl lain mungkin tidak berfungsi dengan betul. Data anda juga akan dipadamkan."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Matikan pemberitahuan"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jika anda mematikan pemberitahuan untuk apl ini, anda mungkin terlepas amaran dan kemas kini penting."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Penggunaan storan"</string>
@@ -1661,10 +1659,8 @@
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Tindihan atas skrin menunjukkan penggunaan semasa CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Paksa penyerahan GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Paksa penggunaan GPU untuk lukisan 2d"</string>
-    <!-- no translation found for force_msaa (7920323238677284387) -->
-    <skip />
-    <!-- no translation found for force_msaa_summary (9123553203895817537) -->
-    <skip />
+    <string name="force_msaa" msgid="7920323238677284387">"Paksa 4x MSAA"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"Dayakan 4x MSAA dalam apl OpenGL ES 2.0"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Penyerahan GPU profil"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"Ukur masa penyerahan dalam adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala animasi tetingkap"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1c70ea2..c77580c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -21,7 +21,7 @@
     <string name="create" msgid="3578857613172647409">"Opprett"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ukjent"</string>
     <string name="show_dev_countdown" msgid="5521163114237004821">"Du er nå <xliff:g id="STEP_COUNT">%1$d</xliff:g> trinn fra å bli en utvikler."</string>
-    <string name="show_dev_on" msgid="1110711554982716293">"Du er en utvikler!"</string>
+    <string name="show_dev_on" msgid="1110711554982716293">"Du er nå utvikler!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Det trengs ikke, du er allerede utvikler."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"TRÅDLØST OG NETTVERK"</string>
     <string name="header_category_device" msgid="5781174212691167553">"ENHET"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7ebd6dd..7c21dc5 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1142,10 +1142,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"De voorkeursinstallatielocatie voor nieuwe apps wijzigen"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Ingebouwde app uitschakelen?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Als u een ingebouwde app uitschakelt, kunnen andere apps onverwacht gedrag vertonen."</string>
-    <!-- no translation found for app_special_disable_dlg_title (2690148680327142674) -->
-    <skip />
-    <!-- no translation found for app_special_disable_dlg_text (3447657419284854195) -->
-    <skip />
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Gegevens verwijderen en app uitschakelen?"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Als u een ingebouwde app uitschakelt, functioneren andere apps mogelijk niet meer correct. Uw gegevens worden ook verwijderd."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Meldingen uitschakelen?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Als u meldingen voor deze app uitschakelt, mist u misschien belangrijke waarschuwingen en updates."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Opslaggebruik"</string>
@@ -1661,10 +1659,8 @@
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Schermoverlay met huidig CPU-gebruik"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU-rendering afdwingen"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Gebruik van GPU voor 2D-tekening forceren"</string>
-    <!-- no translation found for force_msaa (7920323238677284387) -->
-    <skip />
-    <!-- no translation found for force_msaa_summary (9123553203895817537) -->
-    <skip />
+    <string name="force_msaa" msgid="7920323238677284387">"4x MSAA forceren"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"4x MSAA inschakelen in OpenGL ES 2.0-apps"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"GPU-rendering van profiel"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"Renderingtijd in adb shell dumpsys gfxinfo meten"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Vensteranimatieschaal"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 7ffd616..1d42234 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1142,10 +1142,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Zmena preferovaného umiestnenia pre inštaláciu nových aplikácií"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Zakázať vstavanú aplikáciu?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ak zakážete vstavané aplikácie, ostatné aplikácie sa môžu správať zvláštne."</string>
-    <!-- no translation found for app_special_disable_dlg_title (2690148680327142674) -->
-    <skip />
-    <!-- no translation found for app_special_disable_dlg_text (3447657419284854195) -->
-    <skip />
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Odstrániť údaje a zakázať aplikáciu?"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Ak zakážete vstavanú aplikáciu, ostatné aplikácie nemusia fungovať správne. Vaše údaje sa taktiež odstránia."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vypnúť upozornenia?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ak v tejto aplikácii vypnete upozornenia, môžete prísť o dôležité upozornenia a aktuálne informácie."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Využitie ukl. priestoru"</string>
@@ -1661,10 +1659,8 @@
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Prekryvná vrstva obr. s aktuálnym využ. procesora"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Vynútiť vykresľovanie GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Vynútiť použitie jednotky GPU na vykresľovanie 2D"</string>
-    <!-- no translation found for force_msaa (7920323238677284387) -->
-    <skip />
-    <!-- no translation found for force_msaa_summary (9123553203895817537) -->
-    <skip />
+    <string name="force_msaa" msgid="7920323238677284387">"Vynútiť 4x MSAA"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"Povoliť 4x MSAA v aplikáciách OpenGL ES 2.0"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profilové vykresľ. GPU"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"Merať čas vykresľov. v adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Mierka animácie okna"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 1e93c43..a119b51 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1142,10 +1142,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Мењање жељене локације за инсталацију нових апликација"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Желите да онемогућите уграђену апл.?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ако онемогућите уграђену апликацију, друге апликације ће се можда неочекивано понашати."</string>
-    <!-- no translation found for app_special_disable_dlg_title (2690148680327142674) -->
-    <skip />
-    <!-- no translation found for app_special_disable_dlg_text (3447657419284854195) -->
-    <skip />
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Желите ли да избришете податке и онемогућите апликацију?"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Ако онемогућите уграђену апликацију, друге апликације ће можда неправилно функционисати. Такође, подаци ће бити избрисани."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Желите ли да искљ. обавештења?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ако искључите обавештења за ову апликацију, можете да пропустите важна обавештења и ажурирања."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Коришћење меморије"</string>
@@ -1661,10 +1659,8 @@
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Постав. елемент са тренутном употребом процесора"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Принудни приказ пом. GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Принудно користи GPU за 2D цртање"</string>
-    <!-- no translation found for force_msaa (7920323238677284387) -->
-    <skip />
-    <!-- no translation found for force_msaa_summary (9123553203895817537) -->
-    <skip />
+    <string name="force_msaa" msgid="7920323238677284387">"Наметни 4x MSAA"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"Омогући 4x MSAA у OpenGL ES 2.0 апликацијама"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Прикажи профил помоћу GPU"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"Мери време приказивања у adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Размера анимације прозора"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 8fe71b0..8a616f0 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -20,7 +20,7 @@
     <string name="no" msgid="6731231425810196216">"Hapana"</string>
     <string name="create" msgid="3578857613172647409">"Unda"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Haijulikani"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Sasa uko hatua <xliff:g id="STEP_COUNT">%1$d</xliff:g> mbali kuwa msanidi programu."</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Sasa uko katika hatua ya <xliff:g id="STEP_COUNT">%1$d</xliff:g> kuwa msanidi programu."</string>
     <string name="show_dev_on" msgid="1110711554982716293">"Sasa wewe ni msanidi programu!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Hakuna haja, tayari wewe ni msanidi programu."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"MITANDAO NA MITANDAO-HEWA"</string>
@@ -1134,10 +1134,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Badilisha usakinishaji wa eneo unalopenda ya programu mpya"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Lemaza programu zilizoundwa-ndani?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ukilemaza programu iliyoundwa-ndani, programu zingine huenda zisifanye kazi."</string>
-    <!-- no translation found for app_special_disable_dlg_title (2690148680327142674) -->
-    <skip />
-    <!-- no translation found for app_special_disable_dlg_text (3447657419284854195) -->
-    <skip />
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Futa data na ulemaze programu?"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Ukilemaza programu iliyojengewa ndani, programu nyingine zinaweza kuharibika. Pia data yako itafutwa."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Arifa zilemazwe?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ikiwa utazima arifa za programu hii, unaweza kosa kupata arifa na masasisho muhimu."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Matumizi ya hifadhi"</string>
@@ -1304,7 +1302,7 @@
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Ishara za ukuzaji"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kipengele hiki kinapowashwa, unaweza kukuza na kufifiza kwa kugonga skrini mara tatu."\n\n"Unapokuwa umekuza, unaweza:"\n<ul><li>"Kupindua: Vuta vidole viwili au zaidi kwenye skrini."</li>\n<li>"Rekebisha kiwango cha ukuzaji: Bana vidole mbiwili au zaidi pamoja au uzitawanye."</li></ul>\n\n"Pia unaweza kukuza hali, unaweza kuvuta kidole chako ili kuchunguza sehemu mbalimbali za skrini. Inua kidole chako ili kurejea kwenye hali yako ya awali."\n\n"Dokezo: Mgongo wa mara tatu wa ukuzaji unafanya kazi kila mahali isipokuwa kwenye kibodi na upau wa kuabiri."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Njia mkato ya ufikivu"</string>
-    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Washwa"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Imewashwa"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Imezimwa"</string>
     <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kipengele hiki kinapowashwa, unaweza kuwezesha haraka vipengele vya ufikivu kwa hatua mbili:"\n\n"Hatua ya 1: Bonyeza na ushikilie kitufe cha kuwasha/kuzima mpaka utakaposikia sauti au kuhisi mtetemo."\n\n"Hatua ya 2: Gusa na ushikilie vidole viwili mpaka utakaposikia uthibitishaji wa sauti."\n\n"Ikiwa kifaa kina watumiaji wengi, kuutumia mkato huu kwenye skrini ya kufunga kunawezesha ufikivu kwa muda mpaka kifaa kitakapofunguliwa."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Maandishi makubwa"</string>
@@ -1653,10 +1651,8 @@
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Kuegeshwa kwa skrini ikionyesha matumizi ya sasa ya CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Lazimisha kutungiliza  GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Lazimisha matumizi ya GPU kwa uchoraji wa 2d"</string>
-    <!-- no translation found for force_msaa (7920323238677284387) -->
-    <skip />
-    <!-- no translation found for force_msaa_summary (9123553203895817537) -->
-    <skip />
+    <string name="force_msaa" msgid="7920323238677284387">"Lazimisha 4x MSAA"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"Wezesha 4x MSAA katika programu za OpenGL ES 2.0"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Utungilizaji wa GPU ya wasifu"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"Pima muda wa kutungiliza katika adp shell dumpys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Kipimo cha uhiani wa Window"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1aee1de..0769e48 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1149,10 +1149,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Shintsha indawo yokufaka efiswayo yezinhlelo zokusebenza ezintsha"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Khubeza uhlelo lokusebenza olakhelwe"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Uma uyekisa ukusebenza uhlelo lokusebenza olufakwe ngaphakathi, ezinye izinhlelo zokusebenza kungenzeka ukuthi zingenzi kahle."</string>
-    <!-- no translation found for app_special_disable_dlg_title (2690148680327142674) -->
-    <skip />
-    <!-- no translation found for app_special_disable_dlg_text (3447657419284854195) -->
-    <skip />
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Susa idatha futhi ukhubaze uhlelo lokusebenza?"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Uma ukhubaza uhlelo lokusebenza olakhelwe phakathi, ezinye izinhlelo zokusebenza zingahle zingaziphathi kahle. Idatha yakho nayo izosuswa."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Cima izaziso?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Uma ucima izaziso kulolu hlelo lokusebenza, ungageja izaziso nezibuyekezo ezibalulekile."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Ukusetshensiswa kwesitoreji"</string>
@@ -1668,10 +1666,8 @@
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Imbondela yesikrini ibonisa ukusetshenziswa kwe-CPU okwamanje"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Phoqa ukunikeza i-GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Phoqelela ukusetshenziswa kwe-GPU ngomdwebo we-2d"</string>
-    <!-- no translation found for force_msaa (7920323238677284387) -->
-    <skip />
-    <!-- no translation found for force_msaa_summary (9123553203895817537) -->
-    <skip />
+    <string name="force_msaa" msgid="7920323238677284387">"Phoqelela i-4x MSAA"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"Nika amandla i-4x MSAA ezinhlelweni zokusebenza ze-OpenGL ES 2.0"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Iphrofayela ye-GPU iyasebenzeka"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"Kala isikhathi sokusebenzeka ngama-adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Iwindi yesilinganisi sesithombe esinyakazayo"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index abdc521..5310c7b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1293,6 +1293,8 @@
     <string name="wifi_access_points">Wi-Fi networks</string>
     <!-- Menu option to do WPS Push Button [CHAR LIMIT=25]-->
     <string name="wifi_menu_wps_pbc">WPS Push Button</string>
+    <!-- Content description for menu button in Wifi setup. Not shown on the screen. [CHAR LIMIT=NONE] -->
+    <string name="wifi_menu_more_options">More options</string>
     <!-- Menu option to do WPS Pin Entry [CHAR LIMIT=25]-->
     <string name="wifi_menu_wps_pin">WPS Pin Entry</string>
     <!-- Menu option to launch Wi-Fi Direct settings [CHAR LIMIT=20]-->
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index fde2c22..acb669e 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -491,7 +491,7 @@
             showIt = false;
         } else if (UserHandle.myUserId() != 0) {
             showIt = false;
-        } else if (mUserManager.getUsers().size() < 1) {
+        } else if (mUserManager.getUsers().size() < 2) {
             showIt = false;
         }
         menu.findItem(UNINSTALL_ALL_USERS_MENU).setVisible(showIt);