diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 20414b1..6151b13 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -71,6 +71,12 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".SubSettings"
+                android:taskAffinity="com.android.settings"
+                android:theme="@android:style/Theme.Holo"
+                >
+        </activity>
+
         <activity android:name="CreateShortcut" android:label="@string/settings_shortcut"
             android:theme="@style/Theme.CreateShortCut">
             <intent-filter>
diff --git a/res/drawable-hdpi/ic_preferences_collapsed.png b/res/drawable-hdpi/ic_preferences_collapsed.png
deleted file mode 100644
index bc250d8..0000000
--- a/res/drawable-hdpi/ic_preferences_collapsed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_preferences_expanded.png b/res/drawable-hdpi/ic_preferences_expanded.png
deleted file mode 100644
index 08c877d..0000000
--- a/res/drawable-hdpi/ic_preferences_expanded.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/preview.png b/res/drawable-hdpi/preview.png
new file mode 100644
index 0000000..d8f1880
--- /dev/null
+++ b/res/drawable-hdpi/preview.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_preferences_collapsed.png b/res/drawable-mdpi/ic_preferences_collapsed.png
deleted file mode 100644
index bc250d8..0000000
--- a/res/drawable-mdpi/ic_preferences_collapsed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_preferences_expanded.png b/res/drawable-mdpi/ic_preferences_expanded.png
deleted file mode 100644
index 08c877d..0000000
--- a/res/drawable-mdpi/ic_preferences_expanded.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/preview.png b/res/drawable-mdpi/preview.png
similarity index 100%
rename from res/drawable/preview.png
rename to res/drawable-mdpi/preview.png
Binary files differ
diff --git a/res/drawable-xlarge-hdpi/encroid_complete.png b/res/drawable-xlarge-hdpi/encroid_complete.png
deleted file mode 100644
index 6c905d4..0000000
--- a/res/drawable-xlarge-hdpi/encroid_complete.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xlarge-mdpi/encroid_complete.png b/res/drawable-xlarge-mdpi/encroid_complete.png
deleted file mode 100644
index a550212..0000000
--- a/res/drawable-xlarge-mdpi/encroid_complete.png
+++ /dev/null
Binary files differ
diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml
index f2a2f46..10a01c7 100644
--- a/res/layout-land/choose_lock_password.xml
+++ b/res/layout-land/choose_lock_password.xml
@@ -39,7 +39,7 @@
             android:layout_marginBottom="10dip"
             android:gravity="left"
             android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textAppearance="?android:attr/textAppearanceMedium"
         />
 
         <!-- Password entry field -->
@@ -74,6 +74,7 @@
         android:layout_height="wrap_content"
         android:background="#00000000"
         android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+        android:visibility="gone"
     />
 
     <RelativeLayout
diff --git a/res/layout-land/choose_lock_pattern_tutorial.xml b/res/layout-land/choose_lock_pattern_tutorial.xml
new file mode 100644
index 0000000..606d2e1
--- /dev/null
+++ b/res/layout-land/choose_lock_pattern_tutorial.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/topLayout"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+
+        <!-- left side: lock pattern -->
+        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+             android:layout_width="300dip"
+             android:layout_height="300dip"
+             android:layout_gravity="center_horizontal"
+             aspect="square"/>
+
+        <!-- right side: instructions and buttons -->
+        <!-- header message -->
+        <ScrollView
+            android:layout_width="300dip"
+            android:layout_height="180dip"
+            android:layout_alignParentTop="true"
+            android:layout_toRightOf="@id/lockPattern"
+            android:layout_marginLeft="25dip">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="5dip">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:text="@string/lock_title"
+                    android:paddingBottom="10dip"
+                    style="?android:attr/textAppearanceLarge"
+                />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textSize="18sp"
+                    android:text="@string/lock_intro_message"
+                />
+
+            </LinearLayout>
+
+        </ScrollView>
+
+        <LinearLayout
+            style="@style/SecurityPreferenceButtonContainer"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:orientation="horizontal">
+
+            <!-- left / top button: skip, or re-try -->
+            <Button android:id="@+id/skip_button"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpattern_tutorial_cancel_label"/>
+
+            <!-- right / bottom button: confirm or ok -->
+            <Button android:id="@+id/next_button"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpattern_tutorial_continue_label"/>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
+
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index 3a27b9d..4138be1 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -16,12 +16,93 @@
 ** limitations under the License.
 */
 -->
+<!-- This is basically the same layout as choose_lock_password. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:background="@android:color/background_dark"
+    android:gravity="center_horizontal">
 
-<!-- This is basically the same layout now, but will likely change -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <include
-        layout="@layout/choose_lock_password"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <!-- "Enter PIN(Password) to unlock" -->
+        <TextView android:id="@+id/headerText"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="horizontal"
+            android:layout_marginRight="6dip"
+            android:layout_marginLeft="6dip"
+            android:layout_marginTop="10dip"
+            android:layout_marginBottom="10dip"
+            android:gravity="left"
+            android:ellipsize="marquee"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+        />
+
+        <!-- Password entry field -->
+        <EditText android:id="@+id/password_entry"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:singleLine="true"
+            android:textStyle="bold"
+            android:inputType="textPassword"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:textSize="24sp"
+            android:layout_marginTop="5dip"
+            android:layout_marginBottom="5dip"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:background="@drawable/password_field_default"
+            android:textColor="#ffffffff"
+        />
+    </LinearLayout>
+
+    <!-- Spacer between password entry and keyboard -->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1" />
+
+    <!-- Alphanumeric keyboard -->
+    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
+        android:layout_alignParentBottom="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#00000000"
+        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+        android:visibility="gone"
     />
-</merge>
+
+    <RelativeLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:background="@android:drawable/bottom_bar"
+        android:visibility="gone">
+
+        <Button android:id="@+id/cancel_button"
+            android:layout_width="150dip"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dip"
+            android:layout_alignParentLeft="true"
+            android:text="@string/lockpassword_cancel_label"
+        />
+
+        <Button android:id="@+id/next_button"
+            android:layout_width="150dip"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dip"
+            android:layout_alignParentRight="true"
+            android:drawableRight="@drawable/ic_btn_next"
+            android:drawablePadding="10dip"
+            android:text="@string/lockpassword_continue_label"
+        />
+
+    </RelativeLayout>
+
+</LinearLayout>
+
diff --git a/res/layout-xlarge/date_time_settings_setupwizard.xml b/res/layout-xlarge/date_time_settings_setupwizard.xml
index ee425eb..cbef18b 100644
--- a/res/layout-xlarge/date_time_settings_setupwizard.xml
+++ b/res/layout-xlarge/date_time_settings_setupwizard.xml
@@ -75,6 +75,34 @@
             android:layout_marginLeft="32dip"
             android:layout_alignParentRight="true">
 
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/time_zone_button"
+                android:layout_alignParentRight="true">
+
+                <TextView
+                    android:id="@+id/date_time_auto_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="?android:attr/listPreferredItemHeight"
+                    android:layout_marginLeft="16dip"
+                    android:text="@string/date_time_auto"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textSize="20dip"
+                    android:layout_alignParentLeft="true"
+                    android:layout_toLeftOf="@+id/date_time_auto_button"
+                    android:gravity="left|center_vertical" />
+
+                <CheckBox
+                    android:id="@+id/date_time_auto_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_alignParentRight="true" />
+            </RelativeLayout>
+
+            <!--
             <Switch
                 android:id="@+id/date_time_auto_button"
                 android:layout_width="match_parent"
@@ -83,7 +111,7 @@
                 android:layout_marginLeft="16dip"
                 android:text="@string/date_time_auto"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="20dip" />
+                android:textSize="20dip" /> -->
 
             <!-- Divider -->
             <View
diff --git a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
index f755563..f57d3e4 100644
--- a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
@@ -101,7 +101,7 @@
         <FrameLayout
             android:id="@+id/wifi_settings_fragment_layout"
             android:layout_width="716dip"
-            android:layout_height="370dip">
+            android:layout_height="377dip">
             <fragment
                 class="com.android.settings.wifi.WifiSettings"
                 android:id="@+id/wifi_setup_fragment"
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index 3ab1374..a854b9a 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -29,14 +29,13 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:lines="2"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
+        android:textAppearance="?android:attr/textAppearanceMedium"/>
 
     <!-- spacer above text entry field -->
     <View
         android:id="@+id/spacerBottom"
         android:layout_width="fill_parent"
         android:layout_height="1dip"
-        android:layout_marginTop="6dip"
         android:background="@android:drawable/divider_horizontal_dark"
     />
 
@@ -49,8 +48,7 @@
         android:inputType="textPassword"
         android:gravity="center"
         android:layout_gravity="center"
-        android:textSize="32sp"
-        android:layout_marginTop="15dip"
+        android:textSize="24sp"
         android:layout_marginLeft="30dip"
         android:layout_marginRight="30dip"
         android:textAppearance="?android:attr/textAppearanceLarge"
@@ -64,39 +62,30 @@
         android:layout_height="0dip"
         android:layout_weight="1" />
 
+    <LinearLayout
+        style="@style/SecurityPreferenceButtonContainer"
+        android:orientation="horizontal">
+
+        <!-- left : cancel -->
+        <Button android:id="@+id/cancel_button"
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpassword_cancel_label"/>
+
+        <!-- right : continue -->
+        <Button android:id="@+id/next_button"
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpassword_continue_label"/>
+
+    </LinearLayout>
+
     <!-- Alphanumeric keyboard -->
     <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
         android:layout_alignParentBottom="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="#00000000"
-        android:layout_marginBottom="30dip"
         android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+        android:visibility="gone"
     />
 
-    <RelativeLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:background="@android:drawable/bottom_bar">
-
-        <Button android:id="@+id/cancel_button"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dip"
-            android:layout_alignParentLeft="true"
-            android:text="@string/lockpassword_cancel_label"
-        />
-
-        <Button android:id="@+id/next_button"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dip"
-            android:layout_alignParentRight="true"
-            android:drawableRight="@drawable/ic_btn_next"
-            android:drawablePadding="10dip"
-            android:text="@string/lockpassword_continue_label"
-        />
-
-    </RelativeLayout>
-
 </LinearLayout>
diff --git a/res/layout/choose_lock_pattern.xml b/res/layout/choose_lock_pattern.xml
index 97c647f..79307c5 100644
--- a/res/layout/choose_lock_pattern.xml
+++ b/res/layout/choose_lock_pattern.xml
@@ -58,33 +58,19 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        style="@style/SecurityPreferenceButtonContainer"
+        android:orientation="horizontal">
 
-    <LinearLayout style="@android:style/ButtonBar"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
+        <!-- left : cancel, or re-try -->
         <Button android:id="@+id/footerLeftButton"
-            android:layout_height="wrap_content"
-            android:layout_width="140dip"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:text="@string/lockpattern_restart_button_text"/>
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpattern_tutorial_cancel_label"/>
 
-        <View
-            android:visibility="invisible"
-            android:layout_height="0dip"
-            android:layout_width="1dip"
-            android:layout_weight="1" />
-
+        <!-- right : confirm or ok -->
         <Button android:id="@+id/footerRightButton"
-            android:layout_height="wrap_content"
-            android:layout_width="140dip"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:drawableRight="@drawable/ic_btn_next"
-            android:drawablePadding="3dip"
-            android:text="@string/lockpattern_confirm_button_text"/>
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpattern_tutorial_continue_label"/>
 
     </LinearLayout>
 
diff --git a/res/layout/choose_lock_pattern_tutorial.xml b/res/layout/choose_lock_pattern_tutorial.xml
index 3032c05..39fc0a1 100644
--- a/res/layout/choose_lock_pattern_tutorial.xml
+++ b/res/layout/choose_lock_pattern_tutorial.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2011 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,71 +17,68 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_height="match_parent"
-    android:layout_width="match_parent">
-    
-    <ScrollView 
+    android:layout_width="match_parent"
+    android:gravity="center_horizontal">
+
+    <!-- top: instructions and buttons -->
+    <!-- header message -->
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1">
-        
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:padding="5dip">
-            
+
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
                 android:text="@string/lock_title"
                 android:paddingBottom="10dip"
-                android:layout_marginTop="3dip"
                 style="?android:attr/textAppearanceLarge"
             />
-        
-            <TextView 
+
+            <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_marginTop="10dip"
+                android:textSize="18sp"
                 android:text="@string/lock_intro_message"
             />
-            
-        </LinearLayout>
-       
-    </ScrollView>
-    
-    <LinearLayout style="@android:style/ButtonBar"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
 
+        </LinearLayout>
+
+    </ScrollView>
+
+    <!-- bottom: lock pattern -->
+    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+         android:layout_width="300dip"
+         android:layout_height="300dip"
+         aspect="square"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"/>
+
+    <LinearLayout
+        style="@style/SecurityPreferenceButtonContainer"
+        android:orientation="horizontal">
+
+        <!-- left / top button: skip, or re-try -->
         <Button android:id="@+id/skip_button"
-            android:layout_height="wrap_content"
-            android:layout_width="140dip"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:text="@string/skip_button_label"
-        />
-        
-        <!-- Placeholder to get blank space between the two buttons -->
-        <View
-            android:visibility="invisible"
-            android:layout_height="0dip"
-            android:layout_width="1dip"
-            android:layout_weight="1" />
-        
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpattern_tutorial_cancel_label"/>
+
+        <!-- right / bottom button: confirm or ok -->
         <Button android:id="@+id/next_button"
-            android:layout_height="wrap_content"
-            android:layout_width="140dip"
-            android:drawableRight="@drawable/ic_btn_next"
-            android:drawablePadding="3dip"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:text="@string/next_button_label"
-        />
-        
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpattern_tutorial_continue_label"/>
+
     </LinearLayout>
-    
-</LinearLayout >
+
+</LinearLayout>
diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml
index 3a27b9d..308228b 100644
--- a/res/layout/confirm_lock_password.xml
+++ b/res/layout/confirm_lock_password.xml
@@ -17,11 +17,86 @@
 */
 -->
 
-<!-- This is basically the same layout now, but will likely change -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <include
-        layout="@layout/choose_lock_password"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+<!-- This is the same layout as choose_lock_password -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:gravity="center_horizontal">
+
+    <!-- header text ('Enter Pin') -->
+    <TextView android:id="@+id/headerText"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:lines="2"
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+    <!-- spacer above text entry field -->
+    <View
+        android:id="@+id/spacerBottom"
+        android:layout_width="fill_parent"
+        android:layout_height="1dip"
+        android:layout_marginTop="6dip"
+        android:background="@android:drawable/divider_horizontal_dark"
     />
-</merge>
+
+    <!-- Password entry field -->
+    <EditText android:id="@+id/password_entry"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:textStyle="bold"
+        android:inputType="textPassword"
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:textSize="24sp"
+        android:layout_marginLeft="30dip"
+        android:layout_marginRight="30dip"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:background="@drawable/password_field_default"
+        android:textColor="#ffffffff"
+    />
+
+    <!-- Spacer between password entry and keyboard -->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1" />
+
+    <!-- Alphanumeric keyboard -->
+    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
+        android:layout_alignParentBottom="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#00000000"
+        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+        android:visibility="gone"
+    />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+    />
+
+    <LinearLayout
+        style="@style/SecurityPreferenceButtonContainer"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
+
+        <!-- left / top button: skip, or re-try -->
+        <Button android:id="@+id/cancel_button"
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpattern_tutorial_cancel_label"/>
+
+        <!-- right / bottom button: confirm or ok -->
+        <Button android:id="@+id/next_button"
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpattern_tutorial_continue_label"/>
+
+    </LinearLayout>
+
+</LinearLayout>
+
diff --git a/res/layout/wifi_config_ui_for_setup_wizard.xml b/res/layout/wifi_config_ui_for_setup_wizard.xml
index b0f0bb2..138458b 100644
--- a/res/layout/wifi_config_ui_for_setup_wizard.xml
+++ b/res/layout/wifi_config_ui_for_setup_wizard.xml
@@ -14,146 +14,180 @@
      limitations under the License.
 -->
 <!-- All ids in this layout must be in wifi_dialog.xml -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
     <!-- UI components that should be shown appropriately -->
-    <FrameLayout android:id="@+id/eap_not_supported"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:minHeight="360dip"
-                  android:orientation="vertical"
-                  android:visibility="gone">
-        <TextView android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:lineSpacingExtra="12dip"
-                  android:text="@string/wifi_setup_eap_not_supported"
-                  android:textAppearance="?android:attr/textAppearanceMedium"
-                  android:textSize="20sp" />
+    <FrameLayout
+        android:id="@+id/eap_not_supported"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="360dip"
+        android:orientation="vertical"
+        android:visibility="gone">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:lineSpacingExtra="12dip"
+            android:text="@string/wifi_setup_eap_not_supported"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="20sp" />
     </FrameLayout>
     <!-- In "add network" flow, we have security type field (@id/security below) below
          this View, so need a bit different layout than the other flow, in which we'll use
          @id/eap_not_supported. -->
-    <FrameLayout android:id="@+id/eap_not_supported_for_add_network"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical"
-                  android:visibility="gone">
-        <TextView android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:lineSpacingExtra="12dip"
-                  android:text="@string/wifi_setup_eap_not_supported"
-                  android:textAppearance="?android:attr/textAppearanceMedium"
-                  android:textSize="20sp" />
+    <FrameLayout
+        android:id="@+id/eap_not_supported_for_add_network"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:lineSpacingExtra="12dip"
+            android:text="@string/wifi_setup_eap_not_supported"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="20sp" />
     </FrameLayout>
-    <LinearLayout android:id="@+id/wps_fields"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical"
-                  android:visibility="gone">
-        <TextView android:layout_width="match_parent"
-                  android:minWidth="128dip"
-                  android:layout_height="wrap_content"
-                  android:text="@string/wifi_wps_pin"
-                  android:textAppearance="?android:attr/textAppearanceMedium"
-                  android:textSize="20sp"
-                  android:gravity="bottom" />
+    <LinearLayout
+        android:id="@+id/wps_fields"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone">
+        <TextView
+            android:layout_width="match_parent"
+            android:minWidth="128dip"
+            android:layout_height="wrap_content"
+            android:text="@string/wifi_wps_pin"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="20sp"
+            android:gravity="bottom" />
 
-        <EditText android:id="@+id/wps_pin"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:inputType="textPassword"
-                  android:textAppearance="?android:attr/textAppearanceMedium"
-                  android:textSize="20sp" />
+        <EditText
+            android:id="@+id/wps_pin"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:inputType="textPassword"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="20sp" />
     </LinearLayout>
-    <TableLayout android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:layout_marginBottom="16dip">
+    <TableLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dip">
         <!-- To accomodate @id/type into TableLayout, we splitted the layout into two:
              @id/type_ssid and @id/type_security. -->
-        <TableRow android:id="@+id/type_ssid"
-                  android:visibility="gone">
-            <TextView android:id="@+id/ssid_text"
-                      android:layout_width="wrap_content"
-                      android:minWidth="128dip"
-                      android:layout_height="wrap_content"
-                      android:minHeight="48dip"
-                      android:layout_alignParentLeft="true"
-                      android:text="@string/wifi_ssid"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textSize="20sp"
-                      android:gravity="bottom"/>
+        <TableRow
+            android:id="@+id/type_ssid"
+            android:minHeight="56dip"
+            android:visibility="gone">
+            <TextView
+                android:id="@+id/ssid_text"
+                android:layout_width="wrap_content"
+                android:minWidth="128dip"
+                android:layout_height="wrap_content"
+                android:minHeight="56dip"
+                android:paddingRight="16dip"
+                android:layout_alignParentLeft="true"
+                android:text="@string/wifi_ssid"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="20sp"
+                android:gravity="left|center_vertical" />
 
-            <FrameLayout android:id="@+id/ssid_layout"
-                         android:layout_width="wrap_content"
-                         android:layout_height="wrap_content"
-                         android:layout_alignBottom="@id/ssid_text"
-                         android:layout_toRightOf="@id/ssid_text">
-                <EditText android:id="@+id/ssid"
-                          android:layout_width="368dip"
-                          android:layout_height="wrap_content"
-                          android:singleLine="true"
-                          android:inputType="textNoSuggestions"
-                          android:textAppearance="?android:attr/textAppearanceMedium"
-                          android:textSize="20sp" />
+            <FrameLayout
+                android:id="@+id/ssid_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@id/ssid_text"
+                android:layout_toRightOf="@id/ssid_text">
+                <EditText
+                    android:id="@+id/ssid"
+                    android:layout_width="368dip"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:inputType="textNoSuggestions"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textSize="20sp" />
             </FrameLayout>
         </TableRow>
 
-        <TableRow android:id="@+id/security_fields"
-                  android:visibility="gone">
-            <TextView android:id="@+id/password_text"
-                      android:layout_width="wrap_content"
-                      android:minWidth="128dip"
-                      android:layout_height="wrap_content"
-                      android:minHeight="48dip"
-                      android:text="@string/wifi_password"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textSize="20sp"
-                      android:gravity="bottom" />
+        <TableRow
+            android:id="@+id/security_fields"
+            android:minHeight="56dip"
+            android:visibility="gone">
+            <TextView
+                android:id="@+id/password_text"
+                android:layout_width="wrap_content"
+                android:minWidth="128dip"
+                android:layout_height="wrap_content"
+                android:minHeight="56dip"
+                android:text="@string/wifi_password"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="20sp"
+                android:gravity="left|center_vertical" />
 
-            <FrameLayout android:id="@+id/password_layout"
-                         android:layout_width="wrap_content"
-                         android:layout_height="wrap_content"
-                         android:minHeight="48dip">
-                <EditText android:id="@+id/password"
-                          android:layout_width="368dip"
-                          android:layout_height="wrap_content"
-                          android:singleLine="true"
-                          android:password="true"
-                          android:textAppearance="?android:attr/textAppearanceMedium"
-                          android:textSize="20sp" />
+            <LinearLayout
+                android:id="@+id/password_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="bottom">
+                <EditText
+                    android:id="@+id/password"
+                    android:layout_width="368dip"
+                    android:layout_height="wrap_content"
+                    android:minHeight="56dip"
+                    android:singleLine="true"
+                    android:password="true"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textSize="20sp" />
+            </LinearLayout>
+
+            <!-- It looks CheckBox isn't aligned well with TableRow -->
+            <FrameLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+                <CheckBox
+                    android:id="@+id/show_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="56dip"
+                    android:text="@string/wifi_show_password"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textSize="20sp" />
             </FrameLayout>
-
-            <CheckBox android:id="@+id/show_password"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:text="@string/wifi_show_password"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textSize="20sp" />
         </TableRow>
 
-        <TableRow android:id="@+id/type_security"
-                  android:visibility="gone">
-            <TextView android:id="@+id/security_text"
-                      android:layout_width="wrap_content"
-                      android:minWidth="128dip"
-                      android:layout_height="wrap_content"
-                      android:minHeight="48dip"
-                      android:text="@string/wifi_security"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textSize="20sp"
-                      android:gravity="bottom"/>
+        <TableRow
+            android:id="@+id/type_security"
+            android:minHeight="56dip"
+            android:visibility="gone">
+            <TextView
+                android:id="@+id/security_text"
+                android:layout_width="wrap_content"
+                android:minWidth="128dip"
+                android:layout_height="wrap_content"
+                android:minHeight="56dip"
+                android:text="@string/wifi_security"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="20sp"
+                android:gravity="bottom"/>
 
-            <Spinner android:id="@+id/security"
-                     android:layout_width="368dip"
-                     android:layout_height="wrap_content"
-                     android:minHeight="48dip"
-                     android:paddingLeft="4dip"
-                     android:textAppearance="?android:attr/textAppearanceMedium"
-                     android:textSize="20sp"
-                     android:gravity="left|center_vertical"/>
+            <FrameLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="bottom">
+                <Spinner
+                    android:id="@+id/security"
+                    android:layout_width="368dip"
+                    android:layout_height="wrap_content"
+                    android:minHeight="56dip"
+                    android:paddingLeft="4dip"/>
+            </FrameLayout>
         </TableRow>
     </TableLayout>
 
diff --git a/res/layout/wifi_setup_custom_list_item_1.xml b/res/layout/wifi_setup_custom_list_item_1.xml
index 355490e..9d329ea 100644
--- a/res/layout/wifi_setup_custom_list_item_1.xml
+++ b/res/layout/wifi_setup_custom_list_item_1.xml
@@ -22,6 +22,6 @@
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:textSize="20sp"
     android:gravity="center_vertical"
-    android:paddingLeft="10dip"
+    android:paddingLeft="16dip"
     android:minHeight="48dip"
 />
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 24d04ca..f2dfc6c 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 دقائق"</item>
     <item msgid="4322676235684793329">"30 دقيقة"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"صغير جدًا"</item>
+    <item msgid="383133849547816572">"صغير جدًا"</item>
+    <item msgid="6490061470416867723">"صغير"</item>
+    <item msgid="3579015730662088893">"عادي"</item>
+    <item msgid="1678068858001018666">"كبير"</item>
+    <item msgid="490158884605093126">"كبير جدًا"</item>
+    <item msgid="2123802548987439763">"كبير جدًا"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"بطيء للغاية"</item>
     <item msgid="2361722960903353554">"بطيء"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"متوسطة"</item>
     <item msgid="2372711992605524591">"طويلة"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"عدم التحقق مطلقًا"</item>
-    <item msgid="6042769699089883931">"التحقق من محتوى DRM فقط"</item>
-    <item msgid="9174900380056846820">"التحقق دومًا"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"عدم استخدام التحقق من HDCP مطلقًا"</item>
-    <item msgid="3878793616631049349">"استخدام التحقق من HDCP لمحتوى DRM فقط"</item>
-    <item msgid="45075631231212732">"استخدام التحقق من HDCP دومًا"</item>
-  </string-array>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index fe77673..e05f38e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"تعيين خادم HTTP الوكيل وقوائم الاستبعاد"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"محو"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"منفذ الخادم الوكيل"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"تجاوز الخادم الوكيل لـ"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"استعادة الإعدادات الافتراضية"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"الحالة"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"سرعة الربط"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"عنوان IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"طريقة EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"مصادقة المرحلة الثانية"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"شهادة CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"الرجاء كتابة عنوان نظام أسماء نطاقات صالح."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"الرجاء كتابة بادئة شبكة يترواح طولها بين 0 و32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"نظام أسماء النطاقات 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"نظام أسماء النطاقات 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"البوابة"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"طول بادئة الشبكة"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"نقطة اتصال Wi-Fi المحمولة"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"نقطة الاتصال المحمولة <xliff:g id="NETWORK_SSID">%1$s</xliff:g> نشطة"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"خطأ في نقطة اتصال Wi-Fi المتنقلة"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"المهلة"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"يتم إغلاق الشاشة تلقائيًا بعد <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"سطوع تلقائي"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"حجم الخط"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"الحجم الإجمالي للخطوط"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"تحديد حجم الخط"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"إعدادات تأمين بطاقة SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"إعداد تأمين بطاقة SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"تأمين بطاقة SIM"</string>
@@ -753,7 +744,7 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"تم تسجيل دخولك حاليًا في الحسابات التالية:"\n</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"الموسيقى"</li>\n<li>"الصور"</li>\n<li>"بيانات المستخدم الأخرى"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"لمسح الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يلزم محو "<b>"وحدة تخزين USB"</b>"."</string>
-    <!-- syntax error in translation for master_clear_desc_erase_external_storage (7339100478676372901) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:177 in java.io.StringReader@3716ab4e)  -->
+    <!-- syntax error in translation for master_clear_desc_erase_external_storage (7339100478676372901) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:177 in java.io.StringReader@3148aa23)  -->
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"محو وحدة تخزين USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"محو بطاقة SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"محو كل البيانات على وحدة تخزين USB الداخلية، مثل الموسيقى والصور."</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"حذف"</string>
     <string name="misc_files" msgid="6298643430106707497">"ملفات متنوعة"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"تم تحديد <xliff:g id="NUMBER">%1$d</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"تحديد الكل"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"التحقق من HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"تعيين سلوك التحقق من HDCP"</string>
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 084eb86..fd3f678 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 минути"</item>
     <item msgid="4322676235684793329">"30 минути"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Извънредно малък"</item>
+    <item msgid="383133849547816572">"Много малък"</item>
+    <item msgid="6490061470416867723">"Малък"</item>
+    <item msgid="3579015730662088893">"Нормален"</item>
+    <item msgid="1678068858001018666">"Голям"</item>
+    <item msgid="490158884605093126">"Много голям"</item>
+    <item msgid="2123802548987439763">"Извънредно голям"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Много бавна"</item>
     <item msgid="2361722960903353554">"Бавна"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Средно"</item>
     <item msgid="2372711992605524591">"Продължително"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Никога да не се проверява"</item>
-    <item msgid="6042769699089883931">"Проверка само за DRM съдържание"</item>
-    <item msgid="9174900380056846820">"Винаги да се проверява"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Никога да не се използва проверка с HDCP"</item>
-    <item msgid="3878793616631049349">"Да се използва проверка с HDCP само за DRM съдържание"</item>
-    <item msgid="45075631231212732">"Винаги да се използва проверка с HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index f52f396..bcd4d1b 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Задаване на общия HTTP прокси сървър и списъците за изключване"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Изчистване"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Порт на прокси сървъра"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Заобикаляне на прокси сървъра за"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Възстановяване на стандартните"</string>
@@ -296,8 +294,8 @@
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Да се шифрова ли таблетът? Тази операция е необратима и ако я прекъснете, ще загубите данни. Процесът отнема най-малко един час и през това време таблетът ще се рестартира няколко пъти."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Да се шифрова ли телефонът? Тази операция е необратима и ако я прекъснете, ще загубите данни. Процесът отнема най-малко един час и през това време телефонът ще се рестартира няколко пъти."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифроване"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Моля, изчакайте, докато таблетът ви се шифрова. Завършено: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Моля, изчакайте, докато телефонът ви се шифрова. Завършено: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Моля, изчакайте, докато таблетът ви се шифрова. Завършено <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Моля, изчакайте, докато телефонът ви се шифрова. Завършено <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Опитайте отново след <xliff:g id="DELAY">^1</xliff:g> секунди."</string>
     <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Въведете паролата си"</string>
     <string name="crypt_keeper_failed_title" msgid="1166918236711686187">"Шифроването не бе успешно"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Състояние"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Скорост на връзка"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP адрес"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Метод за редактиране на точка за достъп"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Фаза 2 на удостоверяване"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"сертификат от сертифициращ орган"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Моля, въведете валиден адрес за DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Въведете дължина на мрежовия префикс между 0 и 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Дължина на мрежов префикс"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Преносима гореща точка за Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Активна преносима гореща точка <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Грешка на преносимата гореща точка за Wi-Fi"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Време за изчакване"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Екранът се изключва автоматично след <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яркост"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Размер на шрифта"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Общ размер на шрифтовете"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Избор на размер на шрифта"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Настройки за заключването на SIM картата"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Настройване на заключването на SIM картата"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Заключване на SIM картата"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Изтриване"</string>
     <string name="misc_files" msgid="6298643430106707497">"Разни файлове"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"избрани са <xliff:g id="NUMBER">%1$d</xliff:g> от <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> от <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Избиране на всички"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Проверка с HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Повед. за проверка с HDCP"</string>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index f1a69f9..7a21702 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minuts"</item>
     <item msgid="4322676235684793329">"30 minuts"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Extremament petita"</item>
+    <item msgid="383133849547816572">"Molt petita"</item>
+    <item msgid="6490061470416867723">"Petita"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Gran"</item>
+    <item msgid="490158884605093126">"Molt gran"</item>
+    <item msgid="2123802548987439763">"Extremament gran"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Molt lenta"</item>
     <item msgid="2361722960903353554">"Lenta"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Mitjana"</item>
     <item msgid="2372711992605524591">"Llarg"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"No comprovis mai"</item>
-    <item msgid="6042769699089883931">"Comprova només el contingut DRM"</item>
-    <item msgid="9174900380056846820">"Comprova sempre"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"No utilitzis mai la comprovació HDCP"</item>
-    <item msgid="3878793616631049349">"Utilitza la comprovació HDCP només per a contingut DRM"</item>
-    <item msgid="45075631231212732">"Utilitza sempre la comprovació HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4cd2e5d..1ef5e79 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Defineix el servidor intermediari HTTP i les llistes d\'exclusió"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Esborra"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port del servidor intermediari"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Servidor intermediari de derivació de"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restauració del valors predeterminats"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Estat"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Velocitat d\'enllaç"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Adreça IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Mètode EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Autenticació de fase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificat de CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Escriu una adreça DNS vàlida."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Escriu una longitud de prefix de xarxa entre 0 i 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Passarel·la"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longitud de prefix de xarxa"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Punt de connexió Wi-fi portàtil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Punt de connexió portàtil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actiu"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error de punt de connexió Wi-fi portàtil"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Temps d\'espera esgotat"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"La pantalla es desactiva automàticament després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillantor automàtica"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Mida del tipus de lletra"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Mida general dels tipus de lletra"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Selecciona la mida del tipus de lletra"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuració de bloqueig de targeta SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configura el bloqueig de la targeta SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueig de targeta SIM"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Suprimeix"</string>
     <string name="misc_files" msgid="6298643430106707497">"Fitxers varis"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"s\'han seleccionat <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Selecciona-ho tot"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Comprovació HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Defineix comport. comprov. HDCP"</string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 2beb22a..af19f5f 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minut"</item>
     <item msgid="4322676235684793329">"30 minut"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Mimořádně malé"</item>
+    <item msgid="383133849547816572">"Velmi malé"</item>
+    <item msgid="6490061470416867723">"Malé"</item>
+    <item msgid="3579015730662088893">"Normální"</item>
+    <item msgid="1678068858001018666">"Velké"</item>
+    <item msgid="490158884605093126">"Velmi velké"</item>
+    <item msgid="2123802548987439763">"Mimořádně velké"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Velmi pomalá"</item>
     <item msgid="2361722960903353554">"Pomalá"</item>
@@ -106,7 +122,7 @@
     <item msgid="8578370891960825148">"Neúspěšné"</item>
   </string-array>
   <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Otevřená"</item>
+    <item msgid="1435933968767043814">"Otevřít"</item>
     <item msgid="6318432659048829665">"WEP"</item>
     <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
     <item msgid="9098390198768443435">"802.1x EAP"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Střední"</item>
     <item msgid="2372711992605524591">"Dlouhé"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Nikdy nekontrolovat"</item>
-    <item msgid="6042769699089883931">"Kontrolovat jen obsah DRM"</item>
-    <item msgid="9174900380056846820">"Vždy kontrolovat"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Nikdy nepoužívat kontrolu HDCP"</item>
-    <item msgid="3878793616631049349">"Použít kontrolu HDCP pouze pro obsah DRM"</item>
-    <item msgid="45075631231212732">"Vždy používat kontrolu HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6eaa176..6439eff 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Nastavení globálního proxy serveru protokolu HTTP a seznamu vyloučení"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Vymazat"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port proxy"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Nepoužívat server proxy pro"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Obnovit výchozí nastavení"</string>
@@ -298,7 +296,7 @@
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifrování"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Počkejte prosím, než bude tablet zašifrován. Dokončeno: <xliff:g id="PERCENT">^1</xliff:g> %"</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Počkejte prosím, než bude telefon zašifrován. Dokončeno: <xliff:g id="PERCENT">^1</xliff:g> %."</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Zkuste to znovu za: <xliff:g id="DELAY">^1</xliff:g> s."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Sekundy zbývající do dalšího pokusu: <xliff:g id="DELAY">^1</xliff:g>."</string>
     <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Zadejte heslo"</string>
     <string name="crypt_keeper_failed_title" msgid="1166918236711686187">"Šifrování se nezdařilo"</string>
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Šifrování bylo přerušeno a nelze jej dokončit. Před dalším použitím tabletu musíte obnovit tovární nastavení (vymažou se veškerá data). Po obnovení nastavení můžete tablet zašifrovat znovu."</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Stav"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Rychlost připojení"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Adresa IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Metoda EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Ověření Phase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certifikát CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Zadejte platnou adresu DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Zadejte prosím délku síťové předpony v rozsahu 0 až 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"Server DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"Server DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Brána"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Délka síťové předpony"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Přenosný hotspot Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Přenosný hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivní"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Chyba přenosného hotspotu Wi-Fi"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Časový limit"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Obrazovka se automaticky vypne po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>."</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Velikost písma"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Celková velikost písma"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Vybrat velikost písma"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavení zámku karty SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Nastavení zámku karty SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zámek karty SIM"</string>
@@ -680,7 +671,7 @@
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Stahování"</string>
     <string name="memory_dcim_usage" msgid="6679615808140067136">"Fotografie, videa"</string>
     <string name="memory_music_usage" msgid="4040027367622874108">"Zvuk (hudba, vyzváněcí tóny, podcasty atd.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Různé"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Různé."</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odpojit sdílené úložiště"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Odpojit kartu SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Odpojit interní úložiště USB"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Smazat"</string>
     <string name="misc_files" msgid="6298643430106707497">"Různé soubory"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"vybráno: <xliff:g id="NUMBER">%1$d</xliff:g> z <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Vybrat vše"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Kontrola HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Nastavit chování kontroly HDCP"</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 7e162d5..223795c 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minutter"</item>
     <item msgid="4322676235684793329">"30 minutter"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Meget lille"</item>
+    <item msgid="383133849547816572">"Ekstra lille"</item>
+    <item msgid="6490061470416867723">"Lille"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Stor"</item>
+    <item msgid="490158884605093126">"Ekstra stor"</item>
+    <item msgid="2123802548987439763">"Meget stor"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Meget langsom"</item>
     <item msgid="2361722960903353554">"Langsom"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Mellemlangt"</item>
     <item msgid="2372711992605524591">"Lang"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Kontroller aldrig"</item>
-    <item msgid="6042769699089883931">"Kontroller kun for DRM-indhold"</item>
-    <item msgid="9174900380056846820">"Kontroller altid"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Brug aldrig HDCP-kontrol"</item>
-    <item msgid="3878793616631049349">"Brug kun HDCP-kontrol ved DRM-indhold"</item>
-    <item msgid="45075631231212732">"Brug altid HDCP-kontrol"</item>
-  </string-array>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 18b8c1e..6d75f70 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Angiv den globale HTTP-proxy og udeladelseslister"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Ryd"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxy-port"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Brug ikke proxy til"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Gendan standarder"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Linkhastighed"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP-adresse"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP-metode"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Fase 2-godkendelse"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-certifikat"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Indtast en gyldig DNS-adresse."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Angiv et gyldigt netværkspræfiks fra 0 til 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Længde på netværkspræfiks"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Bærbart Wi-Fi-hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Det bærbare hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktivt"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fejl ved bærbart Wi-Fi-hotspot"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Timeout"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Skærmen slukker automatisk efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Skrifttypestørrelse"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Samlede skrifttypestørrelser"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Vælg skrifttypestørrelse"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Indstillinger for lås af SIM-kort"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Konfigurer låsning af SIM-kort"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kortlås"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Slet"</string>
     <string name="misc_files" msgid="6298643430106707497">"Diverse filer"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> valgte ud af <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> ud af <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Vælg alle"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-kontrol"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Indstil HDCP-kontroladfærd"</string>
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 16f412e..68b4ac6 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 Minuten"</item>
     <item msgid="4322676235684793329">"30 Minuten"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Äußerst klein"</item>
+    <item msgid="383133849547816572">"Extraklein"</item>
+    <item msgid="6490061470416867723">"Klein"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Groß"</item>
+    <item msgid="490158884605093126">"Extragroß"</item>
+    <item msgid="2123802548987439763">"Äußerst groß"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Sehr langsam"</item>
     <item msgid="2361722960903353554">"Langsam"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Mittel"</item>
     <item msgid="2372711992605524591">"Lang"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Nie prüfen"</item>
-    <item msgid="6042769699089883931">"Nur auf DRM-Inhalte prüfen"</item>
-    <item msgid="9174900380056846820">"Immer prüfen"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"HDCP-Prüfung nie verwenden"</item>
-    <item msgid="3878793616631049349">"HDCP-Prüfung nur für DRM-Inhalte verwenden"</item>
-    <item msgid="45075631231212732">"HDCP-Prüfung immer verwenden"</item>
-  </string-array>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 67fb24f..1349834 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Globalen HTTP-Proxy und Ausschlusslisten festlegen"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Löschen"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxy-Port"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Umgehung des Proxys für"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Standard wiederherstellen"</string>
@@ -210,7 +208,7 @@
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-Karte wird als Massenspeichergerät verwendet"</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"USB-Speicher kann nun entfernt werden"</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Die SD-Karte kann jetzt entfernt werden."</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-Speicher während Verwendung entfernt"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-Speicher wurde während Verw. entfernt."</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Die SD-Karte wurde während der Verwendung entfernt!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Verwendete Bytes:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"USB-Sp. auf Medien scannen"</string>
@@ -303,8 +301,8 @@
     <string name="crypt_keeper_failed_title" msgid="1166918236711686187">"Verschlüsselung fehlgeschlagen"</string>
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Damit Sie Ihr Tablet wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen, wobei alle Ihre Daten gelöscht werden. Nachdem das Tablet zurückgesetzt wurde, können Sie es erneut verschlüsseln."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Damit Sie Ihr Telefon wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen, wobei alle Ihre Daten gelöscht werden. Nachdem das Telefon zurückgesetzt wurde, können Sie es erneut verschlüsseln."</string>
-    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Display-Sperre konf."</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Display-Sperre konf."</string>
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Bildschirmsperre konf."</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Bildschirmsperre konf."</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Display-Sperre ändern"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Sperre (Muster, PIN, Passwort) ändern oder deaktivieren"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Methode zum Sperren des Bildschirms wählen"</string>
@@ -459,7 +457,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Benachrichtigen, wenn ein offenes Netzwerk verfügbar ist"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"WLAN-Standby-Richtlinie"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Festlegen, wann von WLAN auf mobile Daten umgeschaltet werden soll"</string>
-    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Legen Sie fest, wann die WLAN-Verbindung getrennt werden soll."</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Geben Sie an, wann die WLAN-Verbindung getrennt werden soll."</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Beim Ändern der Einstellung ist ein Problem aufgetreten."</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"WLAN-Netzwerk hinzufügen"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"WLAN-Netzwerke"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Verbindungsgeschwindigkeit"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP-Adresse"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP-Methode"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Phase 2-Authentifizierung"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-Zertifikat"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Geben Sie eine gültige DNS-Adresse ein."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Netzwerkpräfix darf max. 32 Zeichen enthalten."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Länge Netzwerkpräfix"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Mobiler WLAN-Hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Mobiler Hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktiv"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fehler beim mobilen WLAN-Hotspot"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Timeout"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Bildschirm wird nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> automatisch abgeschaltet."</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische Helligkeit"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Schriftgröße"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Allgemeine Schriftgröße"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Schriftgröße auswählen"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Einstellungen für SIM-Karten-Sperre"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM-Sperre einrichten"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-Kartensperre"</string>
@@ -681,7 +672,7 @@
     <string name="memory_dcim_usage" msgid="6679615808140067136">"Bilder, Videos"</string>
     <string name="memory_music_usage" msgid="4040027367622874108">"Audio (Musik, Klingeltöne, Podcasts usw.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Sonstiges"</string>
-    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Gem. Speicher trennen"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Freig. Speicher trennen"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-Karte entnehmen"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Internen USB-Speicher trennen"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SD-Karte trennen, damit Sie sie sicher entfernen können"</string>
@@ -812,9 +803,9 @@
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Internetverbindung des Tablets für ein Gerät freigegeben"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Internetverbindung des Telefons für ein Gerät freigegeben"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Internetverbindung des Tablets für <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> Geräte freigegeben"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Internetverbindung des Telefons für <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> Geräte freigegeben"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Internetverbindung des Tablets nicht freigegeben"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Internetverbindung des Telefons nicht freigegeben"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Internetverbindung d. Telefons für <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> Geräte freigegeben"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Internetverbindung d. Tablets nicht freigegeben"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Internetverbindung d. Telefons nicht freigegeben"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Bluetooth-Tethering-Fehler"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Tethering nur für maximal <xliff:g id="MAXCONNECTION">%1$d</xliff:g> Geräte möglich"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tethering für <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird deaktiviert."</string>
@@ -834,7 +825,7 @@
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Server zur Unterstützung von GPS verwenden (zur Verbesserung der GPS-Leistung deaktivieren)"</string>
     <string name="use_location_title" msgid="3659340070401464551">"Standort für Google-Suche verwenden"</string>
     <string name="use_location_summary_disabled" msgid="6518008620918354403">"Standort für Google-Suche und andere Google-Services verwenden"</string>
-    <string name="use_location_summary_enabled" msgid="8110246289085796179">"Standort wird zur Verbesserung der Google-Suchergebnisse und anderer Google-Dienste verwendet."</string>
+    <string name="use_location_summary_enabled" msgid="8110246289085796179">"Standort wird zur Verbesserung der Google-Suchergebnisse und anderer Google-Services verwendet."</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Über das Tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Über das Telefon"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Rechtliche Hinweise, Status und Softwareversion anzeigen"</string>
@@ -1199,7 +1190,7 @@
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Einstellungen für \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Text-in-Sprache"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Text-in-Sprache-Einstellungen"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Immer meine Einstellungen verwenden"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Immer meine Einst. verwenden"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Standardeinstellungen überschreiben Anwendungseinstellungen"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardeinstellungen"</string>
     <string name="tts_default_synth_title" msgid="29467896463371992">"Standardmodul"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Löschen"</string>
     <string name="misc_files" msgid="6298643430106707497">"Sonstige Dateien"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> von <xliff:g id="TOTAL">%2$d</xliff:g> ausgewählt"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> von <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Alle auswählen"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-Prüfung"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP-Prüfverhalten festl."</string>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 1251358..431634a 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 λεπτά"</item>
     <item msgid="4322676235684793329">"30 λεπτά"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Εξαιρετικά μικρό"</item>
+    <item msgid="383133849547816572">"Πολύ μικρό"</item>
+    <item msgid="6490061470416867723">"Μικρό"</item>
+    <item msgid="3579015730662088893">"Κανονικό"</item>
+    <item msgid="1678068858001018666">"Μεγάλο"</item>
+    <item msgid="490158884605093126">"Πολύ μεγάλο"</item>
+    <item msgid="2123802548987439763">"Εξαιρετικά μεγάλο"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Πολύ αργός"</item>
     <item msgid="2361722960903353554">"Αργός"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Μεσαία"</item>
     <item msgid="2372711992605524591">"Παρατεταμένο"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Να μην γίνεται ποτέ έλεγχος"</item>
-    <item msgid="6042769699089883931">"Έλεγχος μόνο για περιεχόμενο DRM"</item>
-    <item msgid="9174900380056846820">"Να γίνεται πάντα έλεγχος"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Να μην χρησιμοποιείται ποτέ έλεγχος HDCP"</item>
-    <item msgid="3878793616631049349">"Χρήση ελέγχου HDCP μόνο για περιεχόμενο DRM"</item>
-    <item msgid="45075631231212732">"Να χρησιμοποιείται πάντα έλεγχος HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7c62c58..45fe0c0 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Ορίστε το γενικό διακομιστή μεσολάβησης HTTP και τις λίστες εξαιρέσεων"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Εκκαθάριση"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Θύρα διακομιστή μεσολάβησης"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Διακομιστής μεσολάβησης παράκαμψης για"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Επαναφορά προεπιλογών"</string>
@@ -417,7 +415,7 @@
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί από τη συσκευή εισόδου."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Θα γίνει αποσύνδεση της πρόσβασης στο Διαδίκτυο μέσω του <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί από την κοινή χρήση σύνδεσης tablet στο Διαδίκτυο."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί από κοινή χρήση σύνδεσης τηλεφώνου στο Διαδ."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί από κοινή χρήση σύνδεσης τηλεφώνου στο Διαδίκτυο."</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> επιλογές"</string>
     <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Ενέργειες συσκευής"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Σύνδεση"</string>
@@ -430,8 +428,8 @@
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Συνδεδεμένο σε διακομιστή μεταφοράς αρχείων"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Δεν έχει συνδεθεί σε διακομιστή μεταφοράς αρχείων"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Συνδέθηκε σε συσκευή εισόδου"</string>
-    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Συνδέθηκε με συσκευή με πρόσβ. στο Διαδ."</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Κοιν. χρ. σύνδ. στο Διαδ. με συσκευή"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Σύνδεση με συσκευές για σύνδεση στο Διαδίκτυο"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Κοινή χρήση σύνδεσης στο Διαδίκτυο με συσκευή"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Χρήση για ήχο πολυμέσων"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Χρήση για ήχο τηλεφώνου"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Χρήση για τη μεταφορά αρχείων"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Κατάσταση"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Ταχύτητα σύνδεσης"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Διεύθυνση IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Μέθοδος EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"2η φάση ελέγχου ταυτότητας"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Πιστοποιητικό CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Πληκτρολογήστε μια έγκυρη διεύθυνση DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Εισαγάγετε μήκος προθέματος δικτύου από 0 έως 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Πύλη"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Μήκος προθέματος δικτύου"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Φορητό σημείο πρόσβασης Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Το φορητό σημείο πρόσβασης <xliff:g id="NETWORK_SSID">%1$s</xliff:g> είναι ενεργό"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Σφάλμα φορητού σημείου πρόσβασης Wi-Fi"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Λήξη ορίου χρόνου"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Η οθόνη απενεργοποιείται αυτόματα μετά από  <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Αυτόματη φωτεινότητα"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Μέγεθος γραμματοσειράς"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Συνολικό μέγεθος γραμματοσειράς"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Επιλέξτε μέγεθος γραμματοσειράς"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ρυθμίσεις κλειδώματος κάρτας SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ορισμός κλειδώματος κάρτας SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Κλείδωμα κάρτας SIM"</string>
@@ -813,8 +804,8 @@
     <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Κοινή χρήση σύνδεσης τηλεφώνου στο Διαδίκτυο με 1 συσκευή"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Κοινή χρήση σύνδεσης tablet στο Διαδίκτυο με <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> συσκευές"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Κοινή χρήση σύνδεσης τηλεφώνου στο Διαδίκτυο με <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> συσκευές"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Χωρίς κοινή χρήση σύνδεσης tablet στο Διαδ."</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Χωρίς κοινή χρήση σύνδεσης τηλεφώνου στο Διαδ."</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Χωρίς κοινή χρήση σύνδεσης tablet στο Διαδίκτυο"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Χωρίς κοινή χρήση σύνδεσης τηλεφώνου στο Διαδίκτυο"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Σφάλμα Bluetooth tethering"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Δεν γίνεται σύνδ. σε περισσότερες από <xliff:g id="MAXCONNECTION">%1$d</xliff:g> συσκευές"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί."</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Διαγραφή"</string>
     <string name="misc_files" msgid="6298643430106707497">"Διάφορα αρχεία"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Επιλέχθηκαν <xliff:g id="NUMBER">%1$d</xliff:g> από <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> από <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Επιλογή όλων"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Έλεγχος HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Ρύθμιση συμπεριφοράς ελέγχου HDCP"</string>
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 96e9bc8..4731a0d 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minutes"</item>
     <item msgid="4322676235684793329">"30 minutes"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Extremely Small"</item>
+    <item msgid="383133849547816572">"Extra-Small"</item>
+    <item msgid="6490061470416867723">"Small"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Large"</item>
+    <item msgid="490158884605093126">"Extra-Large"</item>
+    <item msgid="2123802548987439763">"Extremely Large"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Very slow"</item>
     <item msgid="2361722960903353554">"Slow"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Medium"</item>
     <item msgid="2372711992605524591">"Long"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Never check"</item>
-    <item msgid="6042769699089883931">"Check for DRM content only"</item>
-    <item msgid="9174900380056846820">"Always check"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Never use HDCP checking"</item>
-    <item msgid="3878793616631049349">"Use HDCP checking for DRM content only"</item>
-    <item msgid="45075631231212732">"Always use HDCP checking"</item>
-  </string-array>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e5016f6..fbc4179 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Set the global HTTP proxy and exclusion lists"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Clear"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxy port"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Bypass proxy for"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restore defaults"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Link speed"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP address"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP method"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Phase-2 authentication"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA certificate"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Please type a valid DNS address."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Please type a network prefix length of between 0 and 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Network prefix length"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Portable Wi-Fi hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Portable hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> active"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Portable Wi-Fi hotspot error"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Timeout"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Screen turns off automatically after <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Overall size of fonts"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Select font size"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Set up SIM card lock"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM card lock"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Delete"</string>
     <string name="misc_files" msgid="6298643430106707497">"Misc. Files"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> out of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Select All"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP checking"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Set HDCP checking behaviour"</string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 3a662b0..33157ee 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minutos"</item>
     <item msgid="4322676235684793329">"30 minutos"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Extremadamente pequeño"</item>
+    <item msgid="383133849547816572">"Extrapequeño"</item>
+    <item msgid="6490061470416867723">"Pequeño"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Grande"</item>
+    <item msgid="490158884605093126">"Extragrande"</item>
+    <item msgid="2123802548987439763">"Extremadamente grande"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Muy lento"</item>
     <item msgid="2361722960903353554">"Lento"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Medio"</item>
     <item msgid="2372711992605524591">"Largo"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Nunca comprobar"</item>
-    <item msgid="6042769699089883931">"Comprobar contenido DRM solamente"</item>
-    <item msgid="9174900380056846820">"Siempre comprobar"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Nunca utilizar comprobación HDCP"</item>
-    <item msgid="3878793616631049349">"Usar comprobación HDCP para contenido DRM solamente"</item>
-    <item msgid="45075631231212732">"Siempre utilizar comprobación HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1ff7825..75cd4be 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Establece el proxy HTTP global y las listas de exclusión"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Borrar"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Puerto proxy"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Saltar proxy para"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar configuraciones predeterminadas"</string>
@@ -416,7 +414,7 @@
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio de manos libres."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del dispositivo de entrada."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Se desconectará el acceso a Internet a través de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> dejará de compartir la conexión a Internet de esta tablet."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> dejará de compartir la conexión a Internet de esta tableta."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> dejará de compartir la conexión a Internet de este teléfono."</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"opciones de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Acciones del dispositivo"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Estado"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Velocidad del vínculo"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Dirección IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Método EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Autenticación de fase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificado de CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Escribe una dirección DNS válida."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Escribe una longitud de prefijo de red entre 0 y 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Acceso"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longitud de prefijo de red"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona activa Wi-Fi portátil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Zona activa portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> conectada"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error en la zona activa Wi-Fi portátil"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Tiempo de espera"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"La pantalla se apaga automáticamente después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Tamaño total de la fuente"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Seleccionar tamaño de fuente"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuración de bloqueo de la tarjeta SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Conf. bloqueo de tarj. SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueo de la tarjeta SIM"</string>
@@ -807,13 +798,13 @@
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB no conectado"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Error de anclaje a red USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Anclaje a red Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Conexión a Internet de esta tablet compartida"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Conexión a Internet de esta tableta compartida"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Conexión a Internet del teléfono compartida"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Conexión a Internet de la tablet compartida con 1 disp."</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Conexión a Internet de la tableta compartida con 1 disp."</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Conexión a Internet del teléfono compartida con 1 disp."</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Conexión a Internet de la tablet compartida con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Conexión a Internet de la tableta compartida con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Conexión a Internet del teléfono compartida con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"No comparte la conexión a Internet de esta tablet"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"No comparte la conexión a Internet de esta tableta"</string>
     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"No comparte la conex. a Internet de este teléfono"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Error en el anclaje a red Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"No se puede realizar el anclaje a red con más de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Eliminar"</string>
     <string name="misc_files" msgid="6298643430106707497">"Archivos misceláneos"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Se seleccionaron <xliff:g id="NUMBER">%1$d</xliff:g> de entre <xliff:g id="TOTAL">%2$d</xliff:g>."</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Seleccionar todo"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Comprobación HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Configurar comportamiento de la comprobación HDCP"</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 0fc04fe..c803c91 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minutos"</item>
     <item msgid="4322676235684793329">"30 minutos"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Sumamente pequeña"</item>
+    <item msgid="383133849547816572">"Muy pequeña"</item>
+    <item msgid="6490061470416867723">"Pequeña"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Grande"</item>
+    <item msgid="490158884605093126">"Muy grande"</item>
+    <item msgid="2123802548987439763">"Sumamente grande"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Muy lenta"</item>
     <item msgid="2361722960903353554">"Lenta"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Medio"</item>
     <item msgid="2372711992605524591">"Largo"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"No comprobar"</item>
-    <item msgid="6042769699089883931">"Buscar solo contenido DRM"</item>
-    <item msgid="9174900380056846820">"Comprobar siempre"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"No utilizar comprobación de HDCP"</item>
-    <item msgid="3878793616631049349">"Utilizar comprobación de HDCP solo para contenido DRM"</item>
-    <item msgid="45075631231212732">"Utilizar siempre comprobación de HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 012f387..38f8aff 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Definir el proxy HTTP global y las listas de exclusión"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Borrar"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Puerto proxy"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Omitir proxy para"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar valores predeterminados"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Estado"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Velocidad de enlace"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Dirección IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Método EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Autenticación de fase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificado de CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Introduce una dirección DNS válida."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Introduce longitud de prefijo de red entre 0 y 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Puerta de enlace"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longitud prefijo de red"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona Wi-Fi portátil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> de zona Wi-Fi portátil activa"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error de zona Wi-Fi portátil"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Tiempo de espera"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"La pantalla se apaga automáticamente después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>."</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Tamaño de fuente general"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Seleccionar tamaño de fuente"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ajustes de bloqueo de tarjeta SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Bloqueo de tarjeta SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueo de tarjeta SIM"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Eliminar"</string>
     <string name="misc_files" msgid="6298643430106707497">"Archivos variados"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Has seleccionado <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>."</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Seleccionar todo"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Comprobación de HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Definir comprobación HDCP"</string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index bbd7880..1b61ad5 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 دقیقه"</item>
     <item msgid="4322676235684793329">"30 دقیقه"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"بی نهایت کوچک"</item>
+    <item msgid="383133849547816572">"بسیار کوچک"</item>
+    <item msgid="6490061470416867723">"کوچک"</item>
+    <item msgid="3579015730662088893">"معمولی"</item>
+    <item msgid="1678068858001018666">"بزرگ"</item>
+    <item msgid="490158884605093126">"بسیار بزرگ"</item>
+    <item msgid="2123802548987439763">"بی نهایت بزرگ"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"بسیار آهسته"</item>
     <item msgid="2361722960903353554">"آهسته"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"متوسط"</item>
     <item msgid="2372711992605524591">"طولانی"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"هرگز بررسی نشود"</item>
-    <item msgid="6042769699089883931">"فقط بررسی محتوای DRM"</item>
-    <item msgid="9174900380056846820">"همیشه بررسی شود"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"هرگز از بررسی HDCP استفاده نشود"</item>
-    <item msgid="3878793616631049349">"استفاده از بررسی HDCP فقط برای محتوای DRM"</item>
-    <item msgid="45075631231212732">"همیشه از بررسی HDCP استفاده شود"</item>
-  </string-array>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d57b0f3..dd86c9c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"تنظیم پروکسی HTTP جهانی و لیست های استثنا"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"پاک کردن"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"درگاه پروکسی"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"پروکسی Bypass برای"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"بازیابی موارد پیش فرض"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"وضعیت"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"سرعت پیوند"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"آدرس IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"روش EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"تأیید اعتبار مرحله 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"گواهی CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"لطفاً یک آدرس dns معتبر بنویسید."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"لطفاً یک پیشوند شبکه با طول بین 0 تا 32 نویسه تایپ کنید."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"دروازه"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"طول پیشوند شبکه"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"نقطه اتصال Wi-Fi قابل حمل"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"نقطه اتصال قابل حمل <xliff:g id="NETWORK_SSID">%1$s</xliff:g> فعال"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"خطای نقطه اتصال Wi-Fi قابل حمل"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"وقفه زمانی"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"صفحه بعد از <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> به صورت خودکار خاموش می شود"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"روشنایی خودکار"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"اندازه قلم"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"اندازه کلی قلم ها"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"انتخاب اندازه قلم"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"تنظیمات قفل سیم کارت"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"تنظیم قفل سیم کارت"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"قفل سیم کارت"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"حذف"</string>
     <string name="misc_files" msgid="6298643430106707497">"فایل های متفرقه"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> مورد انتخاب شده از <xliff:g id="TOTAL">%2$d</xliff:g> مورد"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> از مجموع <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"انتخاب همه"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"بررسی HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"تنظیم عملکرد بررسی HDCP"</string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index c6177f8..2b93f7a 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minuuttia"</item>
     <item msgid="4322676235684793329">"30 minuuttia"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Pikkuruinen"</item>
+    <item msgid="383133849547816572">"Erittäin pieni"</item>
+    <item msgid="6490061470416867723">"Pieni"</item>
+    <item msgid="3579015730662088893">"Normaali"</item>
+    <item msgid="1678068858001018666">"Suuri"</item>
+    <item msgid="490158884605093126">"Erittäin suuri"</item>
+    <item msgid="2123802548987439763">"Jättikoko"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Hyvin hidas"</item>
     <item msgid="2361722960903353554">"Hidas"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Keskipitkä"</item>
     <item msgid="2372711992605524591">"Pitkä"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Älä tarkista koskaan"</item>
-    <item msgid="6042769699089883931">"Tarkista vain DRM-suojattu sisältö"</item>
-    <item msgid="9174900380056846820">"Tarkista aina"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Älä koskaan käytä HDCP-tarkistusta"</item>
-    <item msgid="3878793616631049349">"Käytä HDCP-tarkistusta vain DRM-suojatulle sisällölle"</item>
-    <item msgid="45075631231212732">"Käytä aina HDCP-tarkistusta"</item>
-  </string-array>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 9d94c62..f20ee03 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Aseta yleinen HTTP-välityspalvelin ja poissulkemisluettelot"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Tyhjennä"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Välityspalvelimen portti"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Ohita välityspalvelin seuraavasti:"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Palauta oletukset"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Tila"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Yhteyden nopeus"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP-osoite"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP-tapa"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Todennus: vaihe 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-varmenne"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Anna kelvollinen dns-osoite."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Anna verkon etuliite, jonka pituus on välillä 0–32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Yhdyskäytävä"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Verkon etuliitteen pituus"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Kannettava wifi-yhteyspiste"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Kannettava yhteyspiste <xliff:g id="NETWORK_SSID">%1$s</xliff:g> käytössä"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Kannettavan wifi-yhteyspisteen virhe"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Aikaraja"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Ruutu sammuu automaattisesti <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> kuluttua"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaattinen kirkkaus"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Kirjasimen koko"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Kirjasimen koko"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Valitse kirjasimen koko"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kortin lukitusasetukset"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ota SIM-kortin lukitus käyttöön"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kortin lukitus"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Poista"</string>
     <string name="misc_files" msgid="6298643430106707497">"Muut tiedostot"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"valittu <xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Valitse kaikki"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-tarkistus"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Aseta HDCP-tarkistus"</string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index cd1559b..e3ee507 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minutes"</item>
     <item msgid="4322676235684793329">"30 minutes"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Très petite"</item>
+    <item msgid="383133849547816572">"Très petite"</item>
+    <item msgid="6490061470416867723">"Petite"</item>
+    <item msgid="3579015730662088893">"Normale"</item>
+    <item msgid="1678068858001018666">"Grande"</item>
+    <item msgid="490158884605093126">"Très grande"</item>
+    <item msgid="2123802548987439763">"Très grande"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Très lente"</item>
     <item msgid="2361722960903353554">"Lente"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Moyen"</item>
     <item msgid="2372711992605524591">"Long"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Ne jamais vérifier"</item>
-    <item msgid="6042769699089883931">"Vérifier le contenu GDN uniquement"</item>
-    <item msgid="9174900380056846820">"Toujours vérifier"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Ne jamais utiliser la vérification HDCP"</item>
-    <item msgid="3878793616631049349">"Utiliser la vérification HDCP uniquement pour le contenu GDN"</item>
-    <item msgid="45075631231212732">"Toujours utiliser la vérification HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6e5a703..8db42f2 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Définir le proxy HTTP global et les listes d\'exclusion"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Effacer"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port du proxy"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Ignorer le proxy pour"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Rétablir les paramètres par défaut"</string>
@@ -303,8 +301,8 @@
     <string name="crypt_keeper_failed_title" msgid="1166918236711686187">"Échec du cryptage"</string>
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Le cryptage a été interrompu et l\'opération ne peut être terminée. Vous devez réinitialiser la configuration usine (ce qui effacera l\'ensemble de vos données) avant de réutiliser votre tablette. Vous pouvez essayer de crypter à nouveau votre tablette, une fois la réinitialisation terminée."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Le cryptage a été interrompu et l\'opération ne peut être terminée. Vous devez réinitialiser la configuration usine (ce qui effacera l\'ensemble de vos données) avant de réutiliser votre téléphone. Vous pouvez essayer de crypter à nouveau votre téléphone, une fois la réinitialisation terminée."</string>
-    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Configurer écran verr."</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Configurer écran verr."</string>
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Configurer verr. écran"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Configurer verr. écran"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Modifier le verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Modifier ou désactiver la sécurité : schéma, code PIN ou mot de passe"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Choisir une méthode pour verrouiller l\'écran"</string>
@@ -415,8 +413,8 @@
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio du support."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio en mains libres."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté du périphérique d\'entrée."</string>
-    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"L\'accès à Internet via <xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être interrompu."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ne partagera plus la connexion Internet de la tablette."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"L\'accès à Internet via <xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être déconnecté."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté et ne partagera plus la connexion Internet de la tablette."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté et ne partagera plus la connexion Internet du téléphone."</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Options de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Commandes de l\'appareil"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"État"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Vitesse de connexion"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Adresse IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Méthode EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Authentification phase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificat CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Saisissez une adresse DNS valide."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Le préfixe réseau doit être compris entre 0 et 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Passerelle"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longueur du préfixe réseau"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Point d\'accès Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Point d\'accès Wi-Fi mobile <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actif"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erreur liée au point d\'accès Wi-Fi mobile"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Délai"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"L\'écran s\'éteint automatiquement au bout de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>."</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Taille de la police"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Taille générale des polices"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Sélectionner une taille de police"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres de verrouillage de la SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurer verrouillage carte SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Verrouillage de la SIM"</string>
@@ -694,7 +685,7 @@
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Effacer la mémoire USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Effacer la carte SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Effacer les données de la mémoire de stockage USB interne (ex. : musique, photos)"</string>
-    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Effacer toutes les données de la carte SD, telles que la musique et les photos"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Effacer toutes les données de la carte SD (ex. : musique et photos)"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Non disponible"</string>
     <string name="read_only" msgid="6702420168629076340">" (Lecture seule)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Désinstaller la mémoire de stockage USB"</string>
@@ -811,7 +802,7 @@
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Connexion Internet du téléphone partagée"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Connexion Internet de la tablette partagée avec un appareil"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Connexion Internet du téléphone partagée avec un appareil"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Connexion Internet tablette partagée avec <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> appareils"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Connexion Internet de la tablette partagée avec <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> appareils"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Connexion Internet du téléphone partagée avec <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> appareils"</string>
     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Connexion Internet de la tablette non partagée"</string>
     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Connexion Internet du téléphone non partagée"</string>
@@ -911,7 +902,7 @@
     <string name="auto_launch_label" msgid="3012617472833815382">"Lancer par défaut"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Autorisations"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
-    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Vider le cache"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Effacer le cache"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"Cache"</string>
     <string name="controls_label" msgid="7611113077086853799">"Commandes"</string>
     <string name="force_stop" msgid="7435006169872876756">"Forcer l\'arrêt"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Supprimer"</string>
     <string name="misc_files" msgid="6298643430106707497">"Fichiers divers"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> fichiers sélectionnés sur <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Tout sélectionner"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Vérification HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Config. vérification HDCP"</string>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 1cfe07f..3463630 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minuta"</item>
     <item msgid="4322676235684793329">"30 minuta"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Krajnje malen"</item>
+    <item msgid="383133849547816572">"Izvanredno malen"</item>
+    <item msgid="6490061470416867723">"Malen"</item>
+    <item msgid="3579015730662088893">"Normalan"</item>
+    <item msgid="1678068858001018666">"Velik"</item>
+    <item msgid="490158884605093126">"Izvanredno velik"</item>
+    <item msgid="2123802548987439763">"Krajnje velik"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Jako sporo"</item>
     <item msgid="2361722960903353554">"Sporo"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Srednje"</item>
     <item msgid="2372711992605524591">"Dugo"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Nikad ne provjeravaj"</item>
-    <item msgid="6042769699089883931">"Provjeri samo DRM sadržaj"</item>
-    <item msgid="9174900380056846820">"Uvijek provjeri"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Nikad ne upotrebljavaj HDCP provjeru"</item>
-    <item msgid="3878793616631049349">"Upotrebljavaj HDCP provjeru samo za DRM sadržaj"</item>
-    <item msgid="45075631231212732">"Uvijek upotrebljavaj HDCP provjeru"</item>
-  </string-array>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index f9ad372..41d676e 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Postavi globalni HTTP proxy i popise za isključivanje"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Očisti"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Priključak proxy poslužitelja"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Zaobiđi proxy za"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Vrati zadano"</string>
@@ -213,7 +211,7 @@
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB memorija uklonjena je dok se upotrebljavala!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD kartica je uklonjena tijekom upotrebe!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Iskorišteni bajtovi:"</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Skeniranje USB mem. za medije…"</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Skeniranje USB poh. za medije…"</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Pretraživanje medija na SD kartici skeniranjem…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB poh. uklj. samo za čitanje"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD kartica priključena je u načinu samo za čitanje"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Brzina veze"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP adresa"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP metoda"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"2. faza provjere autentičnosti"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA certifikat"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Upišite važeću dns adresu."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Upišite prefiks mreže duljine između 0 i 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Pristupnik"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Duljina mrežnog prefiksa"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prijenosni Wi-Fi hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Aktivan je prijenosni hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Pogreška prijenosnog Wi-Fi hotspota"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Privremeni prekid"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Zaslon se isključuje automatski nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatska svjetlina"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Opća veličina fonta"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Odabir veličine fonta"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Postavke zaključavanja SIM kartice"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Postavite zaključavanje SIM kartice"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM kartica je zaključana"</string>
@@ -685,7 +676,7 @@
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Isključi SD karticu"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Isključi unutarnju USB memoriju"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Isključite karticu SD radi sigurnog uklanjanja"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Umetni USB mem. za uklj."</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Umetni mem. USB za uklj."</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Umetnite SD karticu za uključivanje"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Uključi memoriju USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Uključivanje SD kartice"</string>
@@ -701,7 +692,7 @@
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Isključi SD karticu"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Ako isključite memoriju USB, neke će se aplikacije koje upotrebljavate zaustaviti i mogu biti nedostupne dok ponovno ne uključite memoriju USB."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Ako isključite SD karticu, dio aplikacija koje koristite zaustavit će rad i možda će biti nedostupne sve dok ponovno ne uključite SD karticu."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Neusp. isključ. USB memorije"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Isključ. memorije USB neuspjelo"</string>
     <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Isključivanje SD kartice nije uspjelo"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Memorija USB ne može se isključiti. Pokušajte ponovno kasnije."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Nije moguće isključiti SD karticu. Pokušajte ponovno."</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Izbriši"</string>
     <string name="misc_files" msgid="6298643430106707497">"Razne datoteke"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"odabrano <xliff:g id="NUMBER">%1$d</xliff:g> od <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Odaberi sve"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP provjera"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Postav. ponaš. HDCP prov."</string>
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index a00d7e7..edd70ed 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 perc"</item>
     <item msgid="4322676235684793329">"30 perc"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Nagyon kicsi"</item>
+    <item msgid="383133849547816572">"Extra kicsi"</item>
+    <item msgid="6490061470416867723">"Kicsi"</item>
+    <item msgid="3579015730662088893">"Normál"</item>
+    <item msgid="1678068858001018666">"Nagy"</item>
+    <item msgid="490158884605093126">"Extra nagy"</item>
+    <item msgid="2123802548987439763">"Nagyon nagy"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Nagyon lassú"</item>
     <item msgid="2361722960903353554">"Lassú"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Közepes"</item>
     <item msgid="2372711992605524591">"Hosszú"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Ellenőrzés soha"</item>
-    <item msgid="6042769699089883931">"Csak DRM-tartalom ellenőrzése"</item>
-    <item msgid="9174900380056846820">"Ellenőrzés mindig"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Soha ne használjon HDCP ellenőrzést"</item>
-    <item msgid="3878793616631049349">"Csak DRM-tartalomhoz használjon HDCP ellenőrzést"</item>
-    <item msgid="45075631231212732">"Mindig használjon HDCP ellenőrzést"</item>
-  </string-array>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 0635f85..9aef3a2 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"A globális HTTP proxy- és kivétellisták beállítása"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Törlés"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxy portja:"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Megkerülési proxy ehhez:"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"pelda.com,szgepem.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Alapértelmezés visszaállítása"</string>
@@ -430,8 +428,8 @@
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Csatlakozva a fájlküldő szerverhez"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nincs csatlakozva a fájlküldő szerverhez"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Beviteli eszköz csatlakoztatva"</string>
-    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Eszközhöz csatlakozik az interneteléréshez"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Helyi internetkapcsolat megosztva az eszközzel"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Eszk.-höz csatl. int.-hez"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Helyi int.kapcs. megosztva az eszk.-el"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Felhasználás az eszköz hangjához"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Felhasználás a telefon hangjához"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Felhasználás fájlátvitelre"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Állapot"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Vonalsebesség"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP-cím"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP módszer"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Hitelesítés 2. fázisa"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA tanúsítvány"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Adjon meg érvényes DNS címet."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"0 és 32 közti hosszt adjon meg a hálózati előtaghoz."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Átjáró"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Hálózati előtag hossza"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hordozható Wi-Fi hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"A(z) <xliff:g id="NETWORK_SSID">%1$s</xliff:g> hordozható hotspot aktív"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"A hordozható Wi-Fi hotspot hibája"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Időtúllépés"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"A képernyő <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> után automatikusan kikapcsol"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatikus fényerő"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Betűméret"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Betűtípusok általános mérete"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Betűméret kiválasztása"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kártya lezárási beállításai"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM-kártya zárolásának beállítása"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kártya zárolása"</string>
@@ -1441,9 +1432,8 @@
     <string name="service_busy" msgid="225227519012409130">"A szolgáltatás elfoglalt, próbálja újra"</string>
     <string name="delete" msgid="4219243412325163003">"Törlés"</string>
     <string name="misc_files" msgid="6298643430106707497">"Egyéb fájlok"</string>
-    <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g>/<xliff:g id="NUMBER">%1$d</xliff:g> kiválasztva"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>/<xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"kiválasztva: <xliff:g id="NUMBER">%1$d</xliff:g>, összesen: <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Összes kijelölése"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP ellenőrzés"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP-ell. viselk. beáll."</string>
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index a281070..ea6aa6d 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 menit"</item>
     <item msgid="4322676235684793329">"30 menit"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Amat Sangat Kecil"</item>
+    <item msgid="383133849547816572">"Ekstra Kecil"</item>
+    <item msgid="6490061470416867723">"Kecil"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Besar"</item>
+    <item msgid="490158884605093126">"Ekstra Besar"</item>
+    <item msgid="2123802548987439763">"Amat Sangat Besar"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Sangat lambat"</item>
     <item msgid="2361722960903353554">"Lambat"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Sedang"</item>
     <item msgid="2372711992605524591">"Lama"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Jangan pernah periksa"</item>
-    <item msgid="6042769699089883931">"Periksa hanya konten DRM"</item>
-    <item msgid="9174900380056846820">"Selalu periksa"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Jangan pernah gunakan pemeriksaan HDCP"</item>
-    <item msgid="3878793616631049349">"Gunakan pemeriksaan HDCP untuk konten DRM saja"</item>
-    <item msgid="45075631231212732">"Selalu gunakan pemeriksaan HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a62d5a8..37dbc5c 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Setel proxy HTTP global dan daftar pengecualian"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Bersihkan"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Porta proxy"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Abaikan proxy untuk"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Pulihkan bawaan"</string>
@@ -416,7 +414,7 @@
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari audio handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari perangkat masukan."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Akses Internet melalui <xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputus."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputus dari berbagi sambungan Internet tablet ini."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputus dari berbagi sambungan Internet ponsel ini."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputus dari berbagi sambungan Internet ponsel ini."</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> opsi"</string>
     <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Tindakan perangkat"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Kecepatan tautan"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"alamat IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Metode EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Autentikasi tahap 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Sertifikat CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Ketikkan alamat dns yang valid."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Ketikkan panjang awalan jaringan antara 0 dan 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Panjang awalan jaringan"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portabel"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> hotspot portabel aktif"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Galat hotspot Wi-Fi portabel"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Waktu tunggu"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Layar mati secara otomatis setelah <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan otomatis"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Ukuran fon"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Ukuran fon keseluruhan"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Pilih ukuran fon"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setelan kunci kartu SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Siapkan kunci kartu SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Kunci kartu SIM"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Hapus"</string>
     <string name="misc_files" msgid="6298643430106707497">"Berkas Serbaneka"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Terpilih <xliff:g id="NUMBER">%1$d</xliff:g> dari <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Pilih Semua"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Pemeriksaan HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Setel perilaku pemeriksaan HDCP"</string>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index ecef4cf..521b651 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minuti"</item>
     <item msgid="4322676235684793329">"30 minuti"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Estremamente piccole"</item>
+    <item msgid="383133849547816572">"Molto piccole"</item>
+    <item msgid="6490061470416867723">"Piccole"</item>
+    <item msgid="3579015730662088893">"Normali"</item>
+    <item msgid="1678068858001018666">"Grandi"</item>
+    <item msgid="490158884605093126">"Molto grandi"</item>
+    <item msgid="2123802548987439763">"Estremamente grandi"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Molto lenta"</item>
     <item msgid="2361722960903353554">"Lenta"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Media"</item>
     <item msgid="2372711992605524591">"Lunga"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Non verificare mai"</item>
-    <item msgid="6042769699089883931">"Verifica solo per contenuti DRM"</item>
-    <item msgid="9174900380056846820">"Verifica sempre"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Non utilizzare mai la verifica HDCP"</item>
-    <item msgid="3878793616631049349">"Usa la verifica HDCP solo per contenuti DRM"</item>
-    <item msgid="45075631231212732">"Usa sempre la verifica HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f5e4dbf..ad90651 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Imposta il proxy HTTP globale e gli elenchi di esclusioni"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Cancella"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Porta proxy"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Ignora proxy per"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Ripristina predefinite"</string>
@@ -431,7 +429,7 @@
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Non collegato al server di trasferimento file"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connesso a dispositivo di input"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connesso a dispositivo per accesso Internet"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Connessione Internet locale condivisa con dispositivo"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Condivisione connessione Internet locale con dispositivo"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Usa per audio media"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Usa per audio telefono"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Usa per trasferimento file"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Stato"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Velocità di collegamento"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Indirizzo IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Metodo EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Autenticazione fase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificato CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Digita un indirizzo DNS valido."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Digita lunghezza prefisso rete tra 0 e 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lunghezza prefisso rete"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portatile"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot portatile <xliff:g id="NETWORK_SSID">%1$s</xliff:g> attivo"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Errore hotspot Wi-Fi portatile"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Timeout"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Lo schermo si spegne automaticamente dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminosità automatica"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Dimensioni carattere"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Dimensioni complessive dei caratteri"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Seleziona dimensioni carattere"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Impostazioni blocco SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Impostazioni blocco SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Blocco della SIM"</string>
@@ -807,12 +798,12 @@
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB non connessa"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Errore tethering USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Connessione Internet di questo tablet condivisa"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Connessione Internet di questo telefono condivisa"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Connessione Internet tablet condivisa con 1 dispositivo"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Connessione Internet telefono condivisa con 1 dispositivo"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Connessione Internet tablet condivisa con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivi"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Connessione Internet telefono condivisa con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivi"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Condivisione connessione Internet di questo tablet"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Condivisione connessione Internet di questo telefono"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Condivisione connessione Internet tablet con 1 dispositivo"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Condivisione connessione Internet telefono con 1 dispositivo"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Condivisione connessione Internet tablet con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivi"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Condivisione connessione Internet telefono con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivi"</string>
     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Connessione Internet del tablet non condivisa"</string>
     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Connessione Internet del telefono non condivisa"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Errore tethering Bluetooth"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Elimina"</string>
     <string name="misc_files" msgid="6298643430106707497">"File vari"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selezionati <xliff:g id="NUMBER">%1$d</xliff:g> di <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> su <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Seleziona tutto"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Verifica HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Comportamento di verifica HDCP"</string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index e58814e..3c32dc3 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 דקות"</item>
     <item msgid="4322676235684793329">"30 דקות"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"קטן מאוד"</item>
+    <item msgid="383133849547816572">"קטן במיוחד"</item>
+    <item msgid="6490061470416867723">"קטן"</item>
+    <item msgid="3579015730662088893">"רגיל"</item>
+    <item msgid="1678068858001018666">"גדול"</item>
+    <item msgid="490158884605093126">"גדול במיוחד"</item>
+    <item msgid="2123802548987439763">"גדול מאוד"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"איטי מאוד"</item>
     <item msgid="2361722960903353554">"לאט"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"בינוני"</item>
     <item msgid="2372711992605524591">"ארוך"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"אל תבדוק לעולם"</item>
-    <item msgid="6042769699089883931">"בדוק אם יש תוכן DRM בלבד"</item>
-    <item msgid="9174900380056846820">"בדוק תמיד"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"לעולם אל תשתמש בבדיקת HDCP"</item>
-    <item msgid="3878793616631049349">"השתמש בבדיקת HDCP עבור תוכן DRM בלבד"</item>
-    <item msgid="45075631231212732">"תמיד השתמש בבדיקת HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 1118044..9ccb529 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"הגדר את שרת proxy הגלובלי של HTTP ורשימות אי הכללה"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"נקה"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"יציאת שרת proxy"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"עקוף שרת proxy עבור"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"שחזר ברירות מחדל"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"מצב"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"מהירות קישור"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"כתובת IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"שיטת EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"אימות שלב 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"אישור CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"הקלד כתובת dns חוקית."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"הקלד אורך של קידומת רשת בין 0 ו-32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"שער"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"אורך קידומת של רשת"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">" נקודה חמה ניידת של Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> פעיל של נקודה חמה ניידת"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"שגיאת נקודה חמה ניידת של Wi-Fi"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"זמן קצוב לתפוגה"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"המסך נכבה אוטומטית לאחר <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"בהירות אוטומטית"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"גודל גופן"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"גודל כולל של גופנים"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"בחר גודל גופן"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"הגדרות נעילת כרטיס SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"הגדרת נעילת כרטיס SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"נעילת כרטיס SIM"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"מחק"</string>
     <string name="misc_files" msgid="6298643430106707497">"קובצי \'שונות\'"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"נבחרו <xliff:g id="NUMBER">%1$d</xliff:g> מתוך <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> מתוך <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"בחר הכל"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"בדיקת HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"הגדר אופן בדיקת HDCP"</string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index f31dad3..cd55a2d 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10分"</item>
     <item msgid="4322676235684793329">"30分"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"極小"</item>
+    <item msgid="383133849547816572">"特小"</item>
+    <item msgid="6490061470416867723">"小"</item>
+    <item msgid="3579015730662088893">"中"</item>
+    <item msgid="1678068858001018666">"大"</item>
+    <item msgid="490158884605093126">"特大"</item>
+    <item msgid="2123802548987439763">"極大"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"非常に遅い"</item>
     <item msgid="2361722960903353554">"遅い"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"中"</item>
     <item msgid="2372711992605524591">"長め"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"チェックしない"</item>
-    <item msgid="6042769699089883931">"DRMコンテンツのみをチェック"</item>
-    <item msgid="9174900380056846820">"常にチェック"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"HDCPチェックを使用しない"</item>
-    <item msgid="3878793616631049349">"DRMコンテンツにのみHDCPチェックを使用する"</item>
-    <item msgid="45075631231212732">"HDCPチェックを常に使用する"</item>
-  </string-array>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 21e2ddb..ca02173 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"グローバルHTTPプロキシと除外リストを設定する"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"消去"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"プロキシポート"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"プロキシを不使用"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"初期設定に戻す"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"接続状況"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"リンク速度"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IPアドレス"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP方式"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"フェーズ2認証"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA証明書"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"有効なDNSアドレスを入力してください。"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"ネットワークプレフィックス長は0～32で指定してください"</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"ゲートウェイ"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"ネットワークプレフィックス長"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"ポータブルWi-Fiアクセスポイント"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"ポータブルアクセスポイント<xliff:g id="NETWORK_SSID">%1$s</xliff:g>が有効です"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"ポータブルWi-Fiアクセスポイントエラー"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"タイムアウト"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"画面を<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後に自動的にOFFにする"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"フォントサイズ"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"全体のフォントサイズ"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"フォントサイズの選択"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIMカードロック設定"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIMカードロック設定"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIMカードロック"</string>
@@ -1441,9 +1432,8 @@
     <string name="service_busy" msgid="225227519012409130">"サービスはビジーです。もう一度お試しください。"</string>
     <string name="delete" msgid="4219243412325163003">"削除"</string>
     <string name="misc_files" msgid="6298643430106707497">"その他のファイル"</string>
-    <string name="misc_files_selected_count" msgid="4647048020823912088">"選択済み: <xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>件"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g>件選択（<xliff:g id="TOTAL">%2$d</xliff:g>件中）"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"すべて選択"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCPチェック"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCPチェック動作を設定"</string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 664dd8c..076aa75 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10분"</item>
     <item msgid="4322676235684793329">"30분"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"매우 작게"</item>
+    <item msgid="383133849547816572">"아주 작게"</item>
+    <item msgid="6490061470416867723">"작게"</item>
+    <item msgid="3579015730662088893">"보통"</item>
+    <item msgid="1678068858001018666">"크게"</item>
+    <item msgid="490158884605093126">"아주 크게"</item>
+    <item msgid="2123802548987439763">"매우 크게"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"매우 느림"</item>
     <item msgid="2361722960903353554">"느림"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"보통"</item>
     <item msgid="2372711992605524591">"길게"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"확인 안함"</item>
-    <item msgid="6042769699089883931">"DRM 콘텐츠만 확인"</item>
-    <item msgid="9174900380056846820">"항상 확인"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"HDCP 확인 사용 안함"</item>
-    <item msgid="3878793616631049349">"DRM 콘텐츠에 대해서만 HDCP 확인 사용"</item>
-    <item msgid="45075631231212732">"항상 HDCP 확인 사용"</item>
-  </string-array>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index be574ac..e2ff3da 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"전체 HTTP 프록시 및 제외목록 설정"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"지우기"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"프록시 포트"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"프록시 우회 대상:"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"기본값 복원"</string>
@@ -459,7 +457,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"개방형 네트워크를 사용할 수 있을 때 알림"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fi 연결 해제 정책"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Wi-Fi에서 모바일 데이터로 전환될 때 표시"</string>
-    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"언제 Wi-Fi 연결을 중단할지 설정"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Wi-Fi에서 연결을 끊을 때 표시"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"설정을 변경하는 중 문제가 발생했습니다."</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Wi-Fi 네트워크 추가"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi 네트워크"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"상태"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"링크 속도"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP 주소"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP 방식"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"단계 2 인증"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA 인증서"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"올바른 DNS 주소를 입력하세요."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"0에서 32 사이의 네트워크 접두비트 길이를 입력해 주세요."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"게이트웨이"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"네트워크 접두어 길이"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"휴대용 Wi-Fi 핫스팟"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"휴대용 핫스팟 <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 사용"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"휴대용 Wi-Fi 핫스팟 오류"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"시간제한"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 후에 화면이 자동으로 꺼짐"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"자동 밝기"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"글꼴 크기"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"전체 글꼴 크기"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"글꼴 크기 선택"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 카드 잠금 설정"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM 카드 잠금 설정"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM 카드 잠금"</string>
@@ -810,7 +801,7 @@
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"이 태블릿의 인터넷 연결 공유 중"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"이 휴대전화의 인터넷 연결 공유"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"1개 기기에 대해 이 태블릿의 인터넷 연결 공유 중"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"1개 기기에 대해 이 휴대전화의 인터넷 연결 공유 중"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"1 기기에 대해 이 휴대전화의 인터넷 연결 공유 중"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>개 기기에 대해 이 태블릿의 인터넷 연결 공유 중"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>개 기기에 대해 이 휴대전화의 인터넷 연결 공유 중"</string>
     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"이 태블릿의 인터넷 연결 공유 상태 아님"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"삭제"</string>
     <string name="misc_files" msgid="6298643430106707497">"기타 파일"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g>개 중 <xliff:g id="NUMBER">%1$d</xliff:g>개가 선택됨"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"모두 선택"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP 확인"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP 확인 동작 설정"</string>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 88eedf3..03d2de7 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 min."</item>
     <item msgid="4322676235684793329">"30 min."</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Ypač mažas"</item>
+    <item msgid="383133849547816572">"Labai mažas"</item>
+    <item msgid="6490061470416867723">"Mažas"</item>
+    <item msgid="3579015730662088893">"Įprastas"</item>
+    <item msgid="1678068858001018666">"Didelis"</item>
+    <item msgid="490158884605093126">"Labai didelis"</item>
+    <item msgid="2123802548987439763">"Ypač didelis"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Labai lėtas"</item>
     <item msgid="2361722960903353554">"Lėtas"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Vidutinis"</item>
     <item msgid="2372711992605524591">"Ilgas"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Niekada netikrinti"</item>
-    <item msgid="6042769699089883931">"Tikrinti tik DRM turinį"</item>
-    <item msgid="9174900380056846820">"Visada tikrinti"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Niekada nenaudoti HDCP tikrinimo"</item>
-    <item msgid="3878793616631049349">"Taikyti HDCP tikrinimą tik DRM turiniui"</item>
-    <item msgid="45075631231212732">"Visada naudoti HDCP tikrinimą"</item>
-  </string-array>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2d7b920..7f2bfac 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Nustatyti bendrąjį HTTP tarpinį serverį ir išimčių sąrašus"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Išvalyti"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Tarpinio serverio prievadas"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Išjungti įgaliotąjį serverį, skirtą"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com, mycomp.test.com, localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Atkurti numatytuosius nustatymus"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Būsena"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Susiejimo greitis"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP adresas"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP būdas"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"2 tapatybės nustatymo fazė"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA sertifikatas"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Įveskite galiojantį DNS adresą."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Įveskite 0–32 simbolių tinklo kodą."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Tinklų sietuvas"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Tinklo kodo ilgis"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Perkeliama „Wi-Fi“ aktyvioji sritis"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Perkeliama aktyvioji sritis <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktyvi"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Perkeliamos „Wi-Fi“ aktyviosios srities klaida"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Baigėsi laikas"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Ekranas automatiškai išsijungia po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis ryškumas"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Visas šriftų dydis"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Pasirinkite šrifto dydį"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kortelės užrakto nustatymai"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Nustatyti SIM kortelės užraktą"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM kortelės užraktas"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Ištrinti"</string>
     <string name="misc_files" msgid="6298643430106707497">"Įvairūs failai"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"pasirinkti (-a) <xliff:g id="NUMBER">%1$d</xliff:g> iš <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> iš <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Pasirinkti viską"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP tikrinimas"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Nust. HDCP tikrin. elgs."</string>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 23ef36d..57e47dc 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minūtes"</item>
     <item msgid="4322676235684793329">"30 minūtes"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Īpaši mazs"</item>
+    <item msgid="383133849547816572">"Ļoti mazs"</item>
+    <item msgid="6490061470416867723">"Mazs"</item>
+    <item msgid="3579015730662088893">"Parasts"</item>
+    <item msgid="1678068858001018666">"Liels"</item>
+    <item msgid="490158884605093126">"Ļoti liels"</item>
+    <item msgid="2123802548987439763">"Īpaši liels"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Ļoti lēni"</item>
     <item msgid="2361722960903353554">"Lēni"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Vidējs"</item>
     <item msgid="2372711992605524591">"Ilgs"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Nekad nepārbaudīt"</item>
-    <item msgid="6042769699089883931">"Pārbaudīt tikai DRM saturu"</item>
-    <item msgid="9174900380056846820">"Vienmēr pārbaudīt"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Nekad neizmantot HDCP pārbaudi"</item>
-    <item msgid="3878793616631049349">"Izmantot HDCP pārbaudi tikai DRM saturam"</item>
-    <item msgid="45075631231212732">"Vienmēr izmantot HDCP pārbaudi"</item>
-  </string-array>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 24bd0f9..330e979 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Iestatiet globālo HTTP starpniekserveri un izslēgšanas sarakstus"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Notīrīt"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Starpniekservera ports"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Apiet starpniekserveri:"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Atjaunot noklusējuma iestatījumus"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Statuss"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Saites izveides ātrums"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP adrese"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP metode"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"2. fāzes autentifikācija"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA sertifikāts"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Lūdzu, ierakstiet derīgu DNS adresi."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Ierakstiet tīkla prefiksu, kura garums ir 0–32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Vārteja"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Tīkla prefiksa garums"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Pārnēsājams Wi-Fi tīklājs"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Pārnēsājamais tīklājs <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ir aktīvs"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Pārnēsājamā Wi-Fi tīklāja kļūda"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Noildze"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Ekrāns automātiski izslēdzas pēc šāda laika: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automātisks spilgtums"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Fonta lielums"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Vispārējs fontu lielums"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Atlasīt fonta lielumu"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kartes bloķēšanas iestatījumi"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Iestatīt SIM kartes bloķēšanu"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM kartes bloķēšana"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Dzēst"</string>
     <string name="misc_files" msgid="6298643430106707497">"Dažādi faili"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Atlasīti <xliff:g id="NUMBER">%1$d</xliff:g> no <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> no <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Atlasīt visu"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP pārbaude"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP pārb. iestatīšana"</string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 6782cea..9ff6f08 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minutter"</item>
     <item msgid="4322676235684793329">"30 minutter"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Ekstremt liten"</item>
+    <item msgid="383133849547816572">"Ekstra liten"</item>
+    <item msgid="6490061470416867723">"Liten"</item>
+    <item msgid="3579015730662088893">"Vanlig"</item>
+    <item msgid="1678068858001018666">"Stor"</item>
+    <item msgid="490158884605093126">"Ekstra stor"</item>
+    <item msgid="2123802548987439763">"Ekstremt stor"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Svært langsom"</item>
     <item msgid="2361722960903353554">"Langsom"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Middels"</item>
     <item msgid="2372711992605524591">"Lang"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Aldri kontrollér"</item>
-    <item msgid="6042769699089883931">"Se kun etter DRM-innhold"</item>
-    <item msgid="9174900380056846820">"Alltid kontrollér"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Aldri bruk HDCP-kontroll"</item>
-    <item msgid="3878793616631049349">"Bruk HDCP-kontroll kun for DRM-innhold"</item>
-    <item msgid="45075631231212732">"Alltid bruk HDCP-kontroll"</item>
-  </string-array>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4bbfe4e..46411dd 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Angi global HTTP-mellomtjener og eksklusjonslister"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Tøm"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port for mellomtjener"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Gå forbi mellomtjener for"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"eteksempel.no,mycomp.test.com,lokal vert"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Gjenopprett standardinnstillinger"</string>
@@ -163,7 +161,7 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Du må skrive inn et portnummer."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Feltet for portnummer må være tomt om feltet for vertsnavn er tomt."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Portnummeret er ikke gyldig."</string>
-    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"HTTP-mellomtjeneren brukes av nettleseren, men kan ikke brukes av andre applikasjoner"</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"HTTP-mellomtjeneren brukes av nettleseren, men kan ikke brukes av andre programmer"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Plassering:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataforsøk:"</string>
@@ -284,8 +282,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Krev personlig tallkode eller passord for å dekryptere nettbrettet hver gang du slår det på"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Numerisk personlig kode eller passord kreves for å dekryptere telefonen hver gang du slår den på"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Kryptert"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Du kan kryptere kontoer, innstillinger, nedlastede applikasjoner med tilhørende data, mediefiler og andre filer. Når du har kryptert nettbrettet, må du angi en personlig tallkode eller passord for å dekryptere det hver gang du slår det på. Du kan kun fjerne krypteringen på nettbrettet ved å utføre en tilbakestilling til fabrikkstandard, noe som vil medføre sletting av alle data."\n\n"Kryptering tar minst én time, og du må starte med ladet batteri og beholde nettbrettet tilkoblet helt til krypteringen er fullført. Du kan miste alle eller deler av dataene hvis du avbryter krypteringprosessen."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Du kan kryptere kontoer, innstillinger, nedlastede applikasjoner med tilhørende data, mediefiler og andre filer. Når du har kryptert telefonen, må du angi en personlig tallkode eller et passord for å dekryptere den hver gang du slår den på. Du kan kun fjerne krypteringen på telefonen ved å gjenopprette fabrikkinnstillingene, noe som vil medføre sletting av alle data."\n\n"Kryptering tar minst én time, og du må starte med ladet batteri og beholde telefonen tilkoblet helt til krypteringen er fullført. Du kan miste alle eller deler av dataene hvis du avbryter krypteringprosessen."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Du kan kryptere kontoer, innstillinger, nedlastede programmer med tilhørende data, mediefiler og andre filer. Når du har kryptert nettbrettet, må du angi en personlig tallkode eller passord for å dekryptere det hver gang du slår det på. Du kan kun fjerne krypteringen på nettbrettet ved å utføre en tilbakestilling til fabrikkstandard, noe som vil medføre sletting av all data."\n\n"Kryptering tar minst én time, og du må starte med ladet batteri og beholde nettbrettet tilkoblet helt til krypteringen er fullført. Du kan miste alle eller deler av dataene hvis du avbryter krypteringprosessen."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Du kan kryptere kontoer, innstillinger, nedlastede programmer med tilhørende data, mediefiler og andre filer. Når du har kryptert telefonen, må du angi en numerisk personlig kode eller passord for å dekryptere den hver gang du slår den på. Du kan kun fjerne krypteringen på telefonen ved å utføre en tilbakestilling til fabrikkstandard, noe som vil medføre sletting av alle data."\n\n"Kryptering tar minst én time, og du må starte med et ladet batteri og beholde telefonen tilkoblet helt til krypteringen er fullført. Du kan miste alle eller deler av dataene hvis du avbryter krypteringprosessen."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krypter nettbrett"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krypter telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Lad batteriet, og prøv på nytt."</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Koblingshastighet"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP-adresse"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP-metode"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Fase 2-autentisering"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-sertifikat"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Angi en gyldig DNS-adresse."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Angi nettverksprefikslengde mellom 0 og 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Standardruter"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lengde på nettv.prefiks"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Flyttbar trådløs sone"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Flyttbar trådløs sone <xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktiv"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Flyttbar trådløs sone – feil"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Tidsavbrudd"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Skjermen slås automatisk av etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Generell skriftstørrelse"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Velg skriftstørrelse"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Innstillinger for SIM-kort-lås"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Sett opp SIM-kort-lås"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kort-lås"</string>
@@ -675,7 +666,7 @@
     <string name="memory_available" msgid="5052397223077021181">"Tilgjengelig"</string>
     <string name="memory_size" msgid="6629067715017232195">"Total plass"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Beregner …"</string>
-    <string name="memory_apps_usage" msgid="9079237985722858506">"Applikasjoner"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Programmer"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medier"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Nedlastinger"</string>
     <string name="memory_dcim_usage" msgid="6679615808140067136">"Bilder, videoer"</string>
@@ -748,8 +739,8 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrikkinnstillinger"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Sletter alle data på nettbrettet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Fjern alle data fra telefonen"</string>
-    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Denne handlingen vil slette alle data fra nettbrettets "<b>"interne lagringsplass"</b>", inkludert:"\n\n<li>"Google-kontoen din"</li>\n<li>"Innstillinger og data for system og applikasjoner"</li>\n<li>"Nedlastede applikasjoner"</li></string>
-    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Denne handlingen sletter alle data fra telefonens "<b>"interne lagringsplass"</b>", herunder:"\n\n<li>"Google-kontoen din"</li>\n<li>"Innstillinger og data for system og applikasjoner"</li>\n<li>"Nedlastede applikasjoner"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Denne handlingen vil slette alle data fra nettbrettets "<b>"interne lagringsplass"</b>", inkludert:"\n\n<li>"Google-kontoen din"</li>\n<li>"Innstillinger og data for system og programmer"</li>\n<li>"Nedlastede programmer"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Denne handlingen vil slette alle data fra telefonens "<b>"interne lagringsplass"</b>", herunder:"\n\n<li>"Google-kontoen din"</li>\n<li>"Innstillinger og data for system og programmer"</li>\n<li>"Nedlastede programmer"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er for øyeblikket pålogget følgende kontoer:"\n</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musikk"</li>\n<li>"Bilder"</li>\n<li>"Andre brukerdata"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"For i tillegg å slette musikk, bilder og andre brukerdata, må "<b>"USB-lagringen"</b>" tømmes."</string>
@@ -903,8 +894,8 @@
     <string name="applications_settings_summary" msgid="2714215108369119717">"Installerte applikasjoner, hurtigtaster"</string>
     <string name="applications_settings_header" msgid="6018266337275422250">"Innstillinger for applikasjoner"</string>
     <string name="install_applications" msgid="4872012136210802181">"Ukjente kilder"</string>
-    <string name="install_unknown_applications" msgid="6612824788917283662">"Tillat installasjon av applikasjoner som ikke kommer fra Android-markedet"</string>
-    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Nettbrettet og dine personlige opplysninger er mer sårbare for angrep av applikasjoner fra ukjente kilder. Du godtar at du selv er ansvarlig for skader på nettbrettet eller tap av data som kan oppstå ved bruk av disse applikasjonene."</string>
+    <string name="install_unknown_applications" msgid="6612824788917283662">"Tillat installasjon av programmer som ikke finnes på Android-markedet"</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Nettbrettet og dine personlige opplysninger er mer sårbare for angrep av programmer fra ukjente kilder. Du godtar at du selv er ansvarlig for skader på nettbrettet eller tap av data som kan oppstå ved bruk av disse programmene."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Telefonen og dine personlige data er mer sårbare mot angrep fra applikasjoner som kommer fra ukjente kilder. Du godtar at du selv er ansvarlig for enhver skade på telefonen eller tap av data som måtte oppstå fra bruk av slike applikasjoner."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Applikasjonsinformasjon"</string>
     <string name="storage_label" msgid="8700867073480107253">"Lagring"</string>
@@ -942,7 +933,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På minnekort"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktivert"</string>
-    <string name="no_applications" msgid="5190227407135243904">"Ingen applikasjoner."</string>
+    <string name="no_applications" msgid="5190227407135243904">"Ingen programmer."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Intern lagring"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lagring"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kortlagring"</string>
@@ -980,9 +971,9 @@
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Flytt program"</string>
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Fikk ikke flyttet programmet. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Foretrukket installeringssted"</string>
-    <string name="app_install_location_summary" msgid="879753854530300436">"Endre foretrukket plassering for installasjon av nye applikasjoner."</string>
+    <string name="app_install_location_summary" msgid="879753854530300436">"Endre foretrukket plassering for installasjon av nye programmer."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Bruk av lagringsplass"</string>
-    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Vis lagringsplass brukt av applikasjoner"</string>
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Vis lagringsplass for programmer"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Kjørende tjenester"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Vis og kontroller tjenester som kjører for øyeblikket"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Starter på nytt"</string>
@@ -1108,8 +1099,8 @@
     <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Tilgjengelighetsskript"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Last ned tilgjengelighetsskript"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Tillat prog. å laste ned tilgjengelighetsskript fra Google"</string>
-    <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Enkelte applikasjoner kan be Google om å laste ned skript til nettbrettet som gjør innholdet deres mer tilgjengelig. Er du sikker på at du vil tillate Google å installere tilgjengelighetsskript på nettbrettet?"</string>
-    <string name="accessibility_script_injection_security_warning" product="default" msgid="9078893361741942109">"Enkelte applikasjoner kan be Google om å laste ned skript til telefonen som gjør innholdet deres mer tilgjengelig. Er du sikker på at du vil tillate Google å installere tilgjengelighetsskript på telefonen?"</string>
+    <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Enkelte programmer kan be Google om å laste ned skript til tavleenheten som gjør programinnholdet mer tilgjengelig. Er du sikker på at du vil tillate Google å installere tilgjengelighetsskript på tavleenheten?"</string>
+    <string name="accessibility_script_injection_security_warning" product="default" msgid="9078893361741942109">"Enkelte programmer kan be Google om å laste ned skript til telefonen som gjøres programinnholdet mer tilgjengelig. Er du sikker på at du vil tillate Google å installere tilgjengelighetsskript på telefonen?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"På/av-knapp"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Legg på med på/av"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Ved å trykke på av-knappen under en samtale, avsluttes samtalen i stedet for at skjermen slås av"</string>
@@ -1180,7 +1171,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Prøv å koble til en annen Bluetooth-enhet"</string>
     <string name="battery_desc_apps" msgid="6665712811746233450">"Batteri brukt av program"</string>
     <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Stopp eller avinstaller applikasjonen"</string>
-    <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"Kontroller GPS manuelt, for å forhindre at applikasjoner bruker funksjonen"</string>
+    <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"Kontroller GPS manuelt, for å forhindre at programmer bruker funksjonen"</string>
     <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"Applikasjonen har muligens innstillinger som kan redusere batteribruken"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden strømmen ble frakoblet"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Siste gang uten strøm i <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -1371,7 +1362,7 @@
     <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi-konfigurering"</string>
     <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Koble til Wi-Fi-nettverk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Kobler til Wi-Fi-nettverk <xliff:g id="NETWORK_NAME">%s</xliff:g> ..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Koblet til Wi-Fi-nettverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Koblet til et Wi-Fi-nettverk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Legg til et nettverk"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Ikke tilkoblet"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Legg til nettverk"</string>
@@ -1401,11 +1392,11 @@
     <string name="add_account_label" msgid="7811707265834013767">"Legg til konto"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Generelle synk.innst."</string>
     <string name="background_data" msgid="5779592891375473817">"Bakgrunnsdata"</string>
-    <string name="background_data_summary" msgid="3630389249212620467">"Apper kan når som helst synkronisere, sende og motta data"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Programmer kan synkronisere, sende og motta data"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Obs"</string>
-    <string name="background_data_dialog_message" msgid="9155730118215371308">"Deaktivering av bakgrunnsdata sparer batteri og reduserer datatrafikken. Det kan hende noen apper fortsatt bruker tilkoblingen for bakgrunnsdata."</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Deaktivering av bakgrunnsdata sparer batteri og reduserer datatrafikken. Noen programmer kan fortsatt bruke tilkoblingen for bakgrunnsdata."</string>
     <string name="sync_automatically" msgid="7558810110682562376">"Automatisk synkronisering"</string>
-    <string name="sync_automatically_summary" msgid="6662623174608419931">"Applikasjoner synkroniserer data automatisk"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Programmer synkroniser data automatisk"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Administrer kontoer"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Synkronisering er på"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Synkronisering er av"</string>
@@ -1430,8 +1421,8 @@
     <string name="really_remove_account_title" msgid="6574643117748564960">"Fjern konto"</string>
     <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Er du sikker på at du vil fjerne denne kontoen? Hvis du fjerner den, fjernes samtidig alle data som er tilknyttet kontoen. "\n"Vil du fortsette?"</string>
     <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Er du sikker på at du vil fjerne denne kontoen? Hvis du fjerner den, fjernes samtidig alle data som er tilknyttet kontoen. "\n"Vil du fortsette?"</string>
-    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Denne kontoen er påkrevd av enkelte applikasjoner. Du kan kun fjerne den ved å tilbakestille nettbrettet til fabrikkinnstillingene (noe som sletter alle personlige data). Dette gjør du under Innstillinger og Personvern."</string>
-    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Denne kontoen er påkrevd av enkelte applikasjoner. Du kan kun fjerne den ved å tilbakestille telefonen til fabrikkstandard (noe som sletter alle personlige data). Dette gjør du under Innstillinger og Personvern."</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Denne kontoen er påkrevd av ett eller flere programmer. Du kan kun fjerne den ved å tilbakestille nettbrettet til fabrikkstandard (dette sletter alle personlige data). Dette gjør du under Innstillinger og Personvern."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Denne kontoen er påkrevd av ett eller flere programmer. Du kan kun fjerne den ved å tilbakestille telefonen til fabrikkstandard (dette sletter alle personlige data). Dette gjør du under Innstillinger og Personvern."</string>
     <string name="provider_label" msgid="7724593781904508866">"Push-abonnementer"</string>
     <string name="sync_item_title" msgid="1931551540462877488">"Synkroniser <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Kan ikke synkronisere manuelt"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Slett"</string>
     <string name="misc_files" msgid="6298643430106707497">"Diverse filer"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"du har valgt <xliff:g id="NUMBER">%1$d</xliff:g> av <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> av totalt <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Marker alle"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-kontroll"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Angi HDPC-kontrollatferd"</string>
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index d4137cc..5fd1c43 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minuten"</item>
     <item msgid="4322676235684793329">"30 minuten"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Zeer klein"</item>
+    <item msgid="383133849547816572">"Extra klein"</item>
+    <item msgid="6490061470416867723">"Klein"</item>
+    <item msgid="3579015730662088893">"Normaal"</item>
+    <item msgid="1678068858001018666">"Groot"</item>
+    <item msgid="490158884605093126">"Extra groot"</item>
+    <item msgid="2123802548987439763">"Zeer groot"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Zeer langzaam"</item>
     <item msgid="2361722960903353554">"Langzaam"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Normaal"</item>
     <item msgid="2372711992605524591">"Lang"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Nooit controleren"</item>
-    <item msgid="6042769699089883931">"Alleen controleren op DRM-inhoud"</item>
-    <item msgid="9174900380056846820">"Altijd controleren"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"HDCP-controle nooit gebruiken"</item>
-    <item msgid="3878793616631049349">"HDCP-controle alleen voor DRM-inhoud gebruiken"</item>
-    <item msgid="45075631231212732">"HDCP-controle altijd gebruiken"</item>
-  </string-array>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index fca5e27..c7da626 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Algemene HTTP-proxy en uitsluitingslijsten instellen"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Wissen"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxy-poort"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Proxy omzeilen voor"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mijncomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Standaardwaarden herstellen"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Linksnelheid"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP-adres"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP-methode"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Phase 2-verificatie"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-certificaat"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Voer een geldig DNS-adres in."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Typ een netwerkprefix van 0-32 tekens."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lengte van netwerkprefix"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Draagbare Wi-Fi-hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Draagbare hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actief"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fout met draagbare Wi-Fi-hotspot"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Time-out"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Het scherm wordt automatisch uitgeschakeld na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische helderheid"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Lettergrootte"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Algemene lettergrootte"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Lettergrootte selecteren"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Instellingen SIM-kaartvergrendeling"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM-vergrendeling instellen"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kaartvergrendeling"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Verwijderen"</string>
     <string name="misc_files" msgid="6298643430106707497">"Diverse bestanden"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> van <xliff:g id="TOTAL">%2$d</xliff:g> geselecteerd"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Alles selecteren"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-controle"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP-controlegedrag instellen"</string>
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 2e70088..83a7482 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 min"</item>
     <item msgid="4322676235684793329">"30 min"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Wyjątkowo mały"</item>
+    <item msgid="383133849547816572">"Bardzo mały"</item>
+    <item msgid="6490061470416867723">"Mały"</item>
+    <item msgid="3579015730662088893">"Normalny"</item>
+    <item msgid="1678068858001018666">"Duży"</item>
+    <item msgid="490158884605093126">"Bardzo duży"</item>
+    <item msgid="2123802548987439763">"Wyjątkowo duży"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Bardzo wolno"</item>
     <item msgid="2361722960903353554">"Wolno"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Średnie"</item>
     <item msgid="2372711992605524591">"Długie"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Nigdy nie sprawdzaj"</item>
-    <item msgid="6042769699089883931">"Sprawdzaj tylko w przypadku treści chronionych DRM"</item>
-    <item msgid="9174900380056846820">"Zawsze sprawdzaj"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Nie sprawdzaj HDCP"</item>
-    <item msgid="3878793616631049349">"Użyj sprawdzania HDCP tylko w przypadku treści chronionych DRM"</item>
-    <item msgid="45075631231212732">"Zawsze używaj sprawdzania HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4fafdab..045a985 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Ustaw globalny serwer proxy HTTP i listę wykluczeń"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Wyczyść"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Numer portu serwera proxy"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Omiń serwer proxy w przypadku"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mojkomputer.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Przywróć ustawienia domyślne"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Stan"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Szybkość łącza"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Adres IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Metoda EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Uwierzytelnianie Phase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certyfikat urzędu certyfikacji"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Wprowadź prawidłowy adres DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Wprowadź długość przedrostka sieci z zakresu 0–32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Brama"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Długość przedrostka sieci"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Przenośny punkt Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Przenośny punkt dostępu <xliff:g id="NETWORK_SSID">%1$s</xliff:g> jest aktywny"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Błąd przenośnego punktu dostępu Wi-Fi"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Wygaszanie"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Ekran wyłączy się automatycznie po upływie <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatyczna jasność"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Rozmiar czcionki"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Ogólny rozmiar czcionek"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Wybierz rozmiar czcionki"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ustawienia blokady karty SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ustaw blokadę SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Blokada karty SIM"</string>
@@ -1031,7 +1022,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Naciśnij dwukrotnie klawisz spacji, aby wstawić kropkę"</string>
     <string name="show_password" msgid="2198798062604049206">"Widoczne hasła"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Pokazuj hasło podczas wpisywania"</string>
-    <string name="ime_security_warning" msgid="812267421486877917">"Ten sposób wprowadzania tekstu może gromadzić całą wpisaną treść, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Dotyczy to aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Czy użyć tego sposobu wprowadzania tekstu?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Ta metoda wprowadzania może gromadzić cały wpisywany tekst, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Metoda pochodzi z aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Czy użyć tej metody wprowadzania?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Słownik użytkownika"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Słownik użytkownika"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
@@ -1058,9 +1049,9 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Aplikacje"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Skróty"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Wprowadzanie tekstu"</string>
-    <string name="input_method" msgid="5434026103176856164">"Sposób wprowadzania tekstu"</string>
-    <string name="current_input_method" msgid="2146807723398303917">"Bieżący sposób wprowadzania tekstu"</string>
-    <string name="input_method_selector" msgid="4311213129681430709">"Wybór sposobu wprowadzania tekstu"</string>
+    <string name="input_method" msgid="5434026103176856164">"Metoda wprowadzania"</string>
+    <string name="current_input_method" msgid="2146807723398303917">"Bieżąca metoda wprowadzania"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Wybór metody wprowadzania"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatyczny"</string>
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Zawsze pokazuj"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Zawsze ukrywaj"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Usuń"</string>
     <string name="misc_files" msgid="6298643430106707497">"Różne pliki"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"wybrano <xliff:g id="NUMBER">%1$d</xliff:g> z <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Zaznacz wszystko"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Sprawdzanie HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Ustaw zachowanie sprawdzania HDCP"</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 396f112..37b853e5 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minutos"</item>
     <item msgid="4322676235684793329">"30 minutos"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Extremamente pequeno"</item>
+    <item msgid="383133849547816572">"Extra pequeno"</item>
+    <item msgid="6490061470416867723">"Pequeno"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Grande"</item>
+    <item msgid="490158884605093126">"Extra grande"</item>
+    <item msgid="2123802548987439763">"Extremamente grande"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Muito lenta"</item>
     <item msgid="2361722960903353554">"Lenta"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Média"</item>
     <item msgid="2372711992605524591">"Longa"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Nunca verificar"</item>
-    <item msgid="6042769699089883931">"Verificar apenas conteúdo DRM"</item>
-    <item msgid="9174900380056846820">"Verificar sempre"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Nunca utilizar a verificação HDCP"</item>
-    <item msgid="3878793616631049349">"Utilizar a verificação HDCP para conteúdo DRM apenas"</item>
-    <item msgid="45075631231212732">"Utilizar sempre a verificação HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b549dd7..d693c8e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Definir o proxy HTTP global e as listas de exclusão"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Limpar"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Porta proxy"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Ignorar proxy para"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"exemplo.com,meucomp.teste.com,anfitirãolocal"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar predefinições"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Estado"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Velocidade da ligação"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Endereço IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"método EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Autenticação da fase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificado CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Introduza um endereço DNS válido."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Introduza um compr. de prefixo de rede de 0 a 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Compr. do prefixo de rede"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portátil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activo"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erro do hotspot Wi-Fi portátil"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Tempo limite"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"O ecrã desliga automaticamente após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Tamanho do tipo de letra"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Tamanho global dos tipos de letra"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Selecionar tamanho do tipo de letra"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Definições de bloqueio do cartão SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurar bloqueio do cartão SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueio do cartão SIM"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Eliminar"</string>
     <string name="misc_files" msgid="6298643430106707497">"Ficheiros diversos"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selecionado(s) <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Selecionar tudo"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Verificação HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Definir o comportamento da verificação HDCP"</string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 3a51c72..ab07226 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minutos"</item>
     <item msgid="4322676235684793329">"30 minutos"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Extremamente pequeno"</item>
+    <item msgid="383133849547816572">"Muito pequeno"</item>
+    <item msgid="6490061470416867723">"Pequeno"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Grande"</item>
+    <item msgid="490158884605093126">"Extra grande"</item>
+    <item msgid="2123802548987439763">"Extremamente grande"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Muito devagar"</item>
     <item msgid="2361722960903353554">"Devagar"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Médio"</item>
     <item msgid="2372711992605524591">"Longo"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Nunca verificar"</item>
-    <item msgid="6042769699089883931">"Verificar somente conteúdo DRM"</item>
-    <item msgid="9174900380056846820">"Sempre verificar"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Nunca usar a verificação HDCP"</item>
-    <item msgid="3878793616631049349">"Usar a verificação HDCP somente para conteúdo DRM"</item>
-    <item msgid="45075631231212732">"Sempre usar a verificação HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 48956e9..d7f799b 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Define o proxy HTTP geral e as listas de exclusão"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Limpar"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Porta do proxy"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Evitar proxy para"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar padrões"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Velocidade do link"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Endereço IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Método EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Autenticação da Fase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificado CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Digite um endereço de DNS válido."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Digite um tamanho do prefixo de rede entre 0 e 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Tamanho do pref. de rede"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Ponto de acesso Wi-Fi portátil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Ponto de acesso portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ativo"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erro de ponto de acesso Wi-Fi portátil"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Tempo limite"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"A tela é automaticamente desativada após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Tamanho total das fontes"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Selecionar o tamanho da fonte"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Conf. bloqueio do SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueio do cartão SIM"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Excluir"</string>
     <string name="misc_files" msgid="6298643430106707497">"Arquivos variados"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selecionados <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Selecionar todos"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Verificação HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Config. a verificação HDCP"</string>
 </resources>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index 9761244..bcbcd77 100644
--- a/res/values-rm/arrays.xml
+++ b/res/values-rm/arrays.xml
@@ -49,6 +49,20 @@
     <!-- no translation found for lock_after_timeout_entries:6 (49888496216106852) -->
     <!-- no translation found for lock_after_timeout_entries:7 (9002737361305019353) -->
     <!-- no translation found for lock_after_timeout_entries:8 (4322676235684793329) -->
+    <!-- no translation found for entries_font_size:0 (2722636506084795405) -->
+    <!-- no translation found for entries_font_size:1 (383133849547816572) -->
+    <!-- no translation found for entries_font_size:2 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:3 (3579015730662088893) -->
+    <!-- no translation found for entries_font_size:4 (1678068858001018666) -->
+    <!-- no translation found for entries_font_size:5 (490158884605093126) -->
+    <!-- no translation found for entries_font_size:6 (2123802548987439763) -->
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Fitg plaun"</item>
     <item msgid="2361722960903353554">"Plaun"</item>
@@ -180,10 +194,4 @@
     <!-- no translation found for long_press_timeout_selector_titles:0 (3511504869290423954) -->
     <!-- no translation found for long_press_timeout_selector_titles:1 (2560532955514699713) -->
     <!-- no translation found for long_press_timeout_selector_titles:2 (2372711992605524591) -->
-    <!-- no translation found for hdcp_checking_titles:0 (441827799230089869) -->
-    <!-- no translation found for hdcp_checking_titles:1 (6042769699089883931) -->
-    <!-- no translation found for hdcp_checking_titles:2 (9174900380056846820) -->
-    <!-- no translation found for hdcp_checking_summaries:0 (505558545611516707) -->
-    <!-- no translation found for hdcp_checking_summaries:1 (3878793616631049349) -->
-    <!-- no translation found for hdcp_checking_summaries:2 (45075631231212732) -->
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index f77730e..027822b 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -162,8 +162,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Definir il proxy HTTP global e las glistas d\'exclusiun"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Stizzar"</string>
     <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <!-- outdated translation 204409815790850313 -->     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Nagin proxy per"</string>
     <!-- no translation found for proxy_exclusionlist_hint (6084099226687226948) -->
     <skip />
@@ -577,8 +575,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Sveltezza da la connexiun"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Adressa IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Metoda EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Autentificaziun fasa 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificat CA"</string>
@@ -627,18 +623,10 @@
     <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
     <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
     <skip />
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Punct d\'access WLAN mobil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Punct d\'access WLAN mobil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activ"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Errur en connex cun il punct d\'access WLAN mobil"</string>
@@ -721,6 +709,12 @@
     <!-- no translation found for screen_timeout_summary (4471347210332380587) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Clerezza automatica"</string>
+    <!-- no translation found for title_font_size (4405544325522105222) -->
+    <skip />
+    <!-- no translation found for summary_font_size (7548243392515500554) -->
+    <skip />
+    <!-- no translation found for dialog_title_font_size (4503471078477715461) -->
+    <skip />
     <string name="sim_lock_settings" msgid="3392331196873564292">"Parameters da bloccaziun SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurar la bloccada SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloccaziun da la SIM"</string>
@@ -1708,8 +1702,4 @@
     <skip />
     <!-- no translation found for select_all (6783085295161532497) -->
     <skip />
-    <!-- no translation found for hdcp_checking_title (8605478913544273282) -->
-    <skip />
-    <!-- no translation found for hdcp_checking_dialog_title (5141305530923283) -->
-    <skip />
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index a501017..514677b 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minute"</item>
     <item msgid="4322676235684793329">"30 de minute"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Extrem de mică"</item>
+    <item msgid="383133849547816572">"Foarte mică"</item>
+    <item msgid="6490061470416867723">"Mică"</item>
+    <item msgid="3579015730662088893">"Normală"</item>
+    <item msgid="1678068858001018666">"Mare"</item>
+    <item msgid="490158884605093126">"Foarte mare"</item>
+    <item msgid="2123802548987439763">"Extrem de mare"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Foarte încet"</item>
     <item msgid="2361722960903353554">"Încet"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Mediu"</item>
     <item msgid="2372711992605524591">"Lungă"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Nu verificaţi niciodată"</item>
-    <item msgid="6042769699089883931">"Verificaţi doar pentru conţinut DRM"</item>
-    <item msgid="9174900380056846820">"Verificaţi întotdeauna"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Nu utilizaţi niciodată verificarea HDCP"</item>
-    <item msgid="3878793616631049349">"Utilizaţi verificarea HDCP numai pentru conţinut DRM"</item>
-    <item msgid="45075631231212732">"Utilizaţi întotdeauna verificarea HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 5b27a51..62cddc7 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Setaţi serverul proxy HTTP global şi listele de excludere"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Ştergeţi"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port proxy"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Evitaţi utilizarea unui proxy pentru"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restabiliţi valorile prestabilite"</string>
@@ -416,8 +414,8 @@
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la componenta audio handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la dispozitivul de intrare."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Va fi întrerupt accesul la internet prin <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la conexiunea acestui telefon la internet."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la conexiunea acestui telefon la internet."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Disp. <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nu i se va mai permite accesul la conexiunea la internet a tabletei."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Disp. <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nu i se va mai permite accesul la conex. la internet a telefonului."</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Opţiuni pentru <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Acţiuni dispozitiv"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Conectaţi-vă"</string>
@@ -430,8 +428,8 @@
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectat la serverul de transfer de fişiere"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Neconectat la serverul de transfer de fişiere"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectat la dispozitivul de intrare"</string>
-    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectat la disp. pt. acces internet"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Se perm. disp. acces la internet local"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Con. la disp. acc. inter."</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Se dist. disp. con. loc."</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizaţi pentru profilul pentru conţinut media audio"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizaţi pentru componenta audio a telefonului"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizaţi pentru transferul de fişiere"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Stare"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Viteză link"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Adresă IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Metodă EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Autentificare faza 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificat CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Introduceţi o adresă DNS validă."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Intr. un prefix de reţea de min. 0 şi max. 32 caract."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lungime prefix reţea"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portabil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot portabil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activ"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Eroare de hotspot Wi-Fi portabil"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Timp limită"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Ecranul se dezactivează automat după <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminozitate automată"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Dimensiune font"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Dimensiunea generală a fonturilor"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Selectaţi dimensiunea fontului"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setări de blocare a cardului SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Activaţi blocarea cardului SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Blocare card SIM"</string>
@@ -807,14 +798,14 @@
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB neconectat"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Eroare de tethering prin USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering prin Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Se permite acces la conexiunea internet a tabletei"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Se permite acces la conex. internet a telefonului"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Se permite acces la conex. internet a tabletei pt. 1 disp."</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Se permite acces la conex. internet a telef. pt. 1 disp."</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Se permite acces la conex.internet a tabletei pt. <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Se permite acces la conex. internet a telef. pt. <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Nu se permite acces la conex. internet a tabletei"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Nu se perm. acces la conex. internet a telefonului"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Se distribuie conex. la internet a tabletei"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Se distribuie conexiunea la internet a telefonului"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Se distrib. conex. la internet a tabletei pe 1 disp."</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Se distribuie conex. la internet a telef. pe 1 disp."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Se distribuie conex. la internet a tabletei pe <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Se distribuie conex. la internet a telef. pe <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Nu se distribuie conex. la internet a tabletei"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Nu se distribuie conex. la internet a telefonului"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Eroare de tethering prin Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Nu vă puteţi conecta la mai mult de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispoz."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat."</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Ştergeţi"</string>
     <string name="misc_files" msgid="6298643430106707497">"Fişiere diverse"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"au fost selectate <xliff:g id="NUMBER">%1$d</xliff:g> din <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> din <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Selectaţi-le pe toate"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Verificare HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Setaţi comp. verif. HDCP"</string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 884a78c..e2f3333 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 мин"</item>
     <item msgid="4322676235684793329">"30 мин"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Самый мелкий"</item>
+    <item msgid="383133849547816572">"Очень мелкий"</item>
+    <item msgid="6490061470416867723">"Мелкий"</item>
+    <item msgid="3579015730662088893">"Обычный"</item>
+    <item msgid="1678068858001018666">"Крупный"</item>
+    <item msgid="490158884605093126">"Очень крупный"</item>
+    <item msgid="2123802548987439763">"Самый крупный"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Очень медленная"</item>
     <item msgid="2361722960903353554">"Медленная"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Средний"</item>
     <item msgid="2372711992605524591">"Большой"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Никогда не проверять"</item>
-    <item msgid="6042769699089883931">"Проверять только содержание DRM"</item>
-    <item msgid="9174900380056846820">"Всегда проверять"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Не использовать проверку HDCP"</item>
-    <item msgid="3878793616631049349">"Использовать проверку HDCP только для содержания DRM"</item>
-    <item msgid="45075631231212732">"Всегда использовать проверку HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f4784de..4f43e95 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -133,7 +133,7 @@
     <string name="date_and_time" msgid="4114084177056654663">"Настройки даты и времени"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 pm"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
-    <string name="choose_timezone" msgid="7762866468013985022">"Выбор часового пояса"</string>
+    <string name="choose_timezone" msgid="7762866468013985022">"Выбрать часовой пояс"</string>
     <string name="normal_date_format" msgid="1982904221918374153">"Обычный (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Предварительный просмотр:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Размер шрифта:"</string>
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Настройка глобального прокси HTTP и списка исключений"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Очистить"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Порт прокси-сервера"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Не использовать прокси-сервер для:"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Восстановить настройки по умолчанию"</string>
@@ -210,7 +208,7 @@
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-карта используется в качестве устройства массовой памяти"</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"USB-накопитель можно отключить"</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"SD-карта может быть извлечена"</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Накопитель извлечен при исп.!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Накопитель извлечен во время использования!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD-карта была извлечена во время использования!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Использовано байтов:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Сканирование USB-накопителя..."</string>
@@ -259,10 +257,10 @@
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Использовать часовой пояс сети"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Использовать часовой пояс сети"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-часовой формат"</string>
-    <string name="date_time_set_time" msgid="5716856602742530696">"Время"</string>
-    <string name="date_time_set_timezone" msgid="5045627174274377814">"Часовой пояс"</string>
-    <string name="date_time_set_date" msgid="7021491668550232105">"Дата"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Формат даты"</string>
+    <string name="date_time_set_time" msgid="5716856602742530696">"Настроить время"</string>
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"Выбрать часовой пояс"</string>
+    <string name="date_time_set_date" msgid="7021491668550232105">"Настроить дату"</string>
+    <string name="date_time_date_format" msgid="436706100255870967">"Выбрать формат даты"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Упорядочить по алфавиту"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Упорядочить по часовому поясу"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Дата"</string>
@@ -303,19 +301,19 @@
     <string name="crypt_keeper_failed_title" msgid="1166918236711686187">"Ошибка шифрования"</string>
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Шифрование прервано и не может быть возобновлено. Чтобы получить возможность пользоваться планшетным ПК, необходимо выполнить сброс настроек, при этом все данные будут удалены. После сброса настроек можно повторно запустить процедуру шифрования."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Шифрование прервано и не может быть возобновлено. Чтобы получить возможность пользоваться телефоном, необходимо выполнить сброс настроек, при этом все данные будут удалены. После сброса настроек можно повторно запустить процедуру шифрования."</string>
-    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Настройка блок. экрана"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Настройка блок. экрана"</string>
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Настройка блокировки экрана"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Настройка блокировки экрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Сменить способ блокировки"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Смена или отключение графического ключа, PIN-кода и пароля"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Выбрать метод блокировки экрана"</string>
     <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"Отключение"</string>
     <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Никогда не блокировать экран"</string>
     <string name="unlock_set_unlock_none_title" msgid="7560817055143323842">"Безопасность отключена"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Откл. граф. ключа, PIN, пароля разбл. экрана"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Отключение графического ключа, PIN-кода или пароля для разблокировки экрана"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Графический ключ"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Создать графический ключ для разблокировки экрана"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Создать цифровой PIN-код для разбл. экрана"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Создать цифровой PIN-код для разблокировки экрана"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Пароль"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Создать пароль для разблокировки экрана"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Отключено администратором или политикой шифрования"</string>
@@ -416,8 +414,8 @@
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Устройство <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет отключено от гарнитуры."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> отключается от устройства ввода."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Доступ в Интернет через устройство <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет отключен."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Интернет-подключение планшетного ПК перестанет использоваться устройством <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Интернет-подключение телефона перестанет использоваться устройством <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Устр-во <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет отключено от общего интернет-соединения этого планшетного ПК."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Устройство <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет отключено от общего интернет-соединения этого телефона."</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"параметры <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Действия устройства"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Подключить"</string>
@@ -430,8 +428,8 @@
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Установлено подключение к серверу передачи файлов"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Нет подключения к серверу передачи файлов"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Подключено к устройству ввода"</string>
-    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Используется интернет-подключение другого устройства"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Устройство работает в режиме модема"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Подключено к устройству для доступа в Интернет"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Интернет-подключение используется совместно"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Использовать для мультимедийного аудиоустройства"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Использовать для аудиоустройства телефона"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Используется для передачи файлов"</string>
@@ -459,7 +457,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Сообщать при обнаружении открытой сети"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Правила отключения от сети Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"При каких условиях переключаться с Wi-Fi на сотовую сеть"</string>
-    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Настройки отключения от сети Wi-Fi"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Укажите, когда следует отключаться от Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Не удалось изменить этот параметр"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Добавить сеть Wi-Fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Сети Wi-Fi"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Статус"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Скорость связи"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP-адрес"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Метод EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"2-й этап аутентификации"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Сертификат центра сертификации"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Введите действительный DNS-адрес."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Введите префикс сети длиной от 0 до 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Длина префикса сети"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Точка доступа Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Точка доступа <xliff:g id="NETWORK_SSID">%1$s</xliff:g> активна"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Ошибка подключения"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Тайм-аут"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Экран отключится автоматически после <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Яркость автоматически"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Размер шрифта"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Размер шрифтов"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Выберите размер шрифта"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Настройки блокировки SIM-карты"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Настроить блокировку"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Блокировка SIM-карты"</string>
@@ -685,7 +676,7 @@
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Извлечь SD-карту"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Отключить внутр. USB-накопитель"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Отключение SD-карты для ее безопасного извлечения из устройства"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Вставить USB-накопитель"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Вставить USB-накопитель для подключения"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Вставьте SD-карту для подключения"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Подключить USB-накопитель"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Подключить SD-карту"</string>
@@ -807,14 +798,14 @@
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB-подключения не обнаружено"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Ошибка подключения USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Общий Bluetooth-модем"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Устройство работает в режиме модема"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Режим модема на этом устройстве включен"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Интернет-подключение планшетного ПК используется 1 устройством"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Интернет-подключение телефона используется 1 устройством"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Интернет-подключение планшетного ПК используется <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> устройствами"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Интернет-подключение телефона используется <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> устройствами"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Режим модема на этом устройстве отключен"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Режим модема на этом устройстве отключен"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Интернет-подключение планшетного ПК общедоступно"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Интернет-подключение этого телефона общедоступно"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Интернет-подключение планшетного ПК доступно для 1 устр-ва."</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Интернет-подключение телефона доступно для 1 устройства."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Интернет-подключение планшетного ПК доступно для <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> устр."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Интернет-подключение телефона доступно для <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> устр."</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Интернет-подключение планшетного ПК недоступно другим"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Интернет-подключение телефона недоступно другим"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Ошибка общего Bluetooth-модема"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Нельзя установить подключение более, чем для <xliff:g id="MAXCONNECTION">%1$d</xliff:g> устр."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Подключение к <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет прервано."</string>
@@ -1316,14 +1307,14 @@
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(не настроено)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Хранилище регистрационных данных"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Доступ к хранилищу"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Разрешить приложениям использовать хранилище сертификатов и учет. данных"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Разрешить приложениям использовать хранилище сертификатов и рег. данных"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Устанавливать с карты памяти."</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Установка с SD-карты"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Устанавливать сертификаты с карты памяти"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Установить сертификаты с SD-карты"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Установить пароль"</string>
     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Установить или изменить пароль для хранилища регистрационных данных"</string>
-    <string name="credentials_reset" msgid="3239382277144980418">"Очистить учетные данные"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Очистить регистрационные данные"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Удалить все содержание и сбросить пароль"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Ввод пароля"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Введите пароль для хранилища регистрационных данных."</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Удалить"</string>
     <string name="misc_files" msgid="6298643430106707497">"Разное"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"выбрано <xliff:g id="NUMBER">%1$d</xliff:g> из <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> из <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Выбрать все"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Проверка HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Порядок проверки HDCP"</string>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 0c38bf1..99096dd 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minút"</item>
     <item msgid="4322676235684793329">"30 minút"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Mimoriadne malé"</item>
+    <item msgid="383133849547816572">"Veľmi malé"</item>
+    <item msgid="6490061470416867723">"Malé"</item>
+    <item msgid="3579015730662088893">"Normálne"</item>
+    <item msgid="1678068858001018666">"Veľké"</item>
+    <item msgid="490158884605093126">"Veľmi veľké"</item>
+    <item msgid="2123802548987439763">"Mimoriadne veľké"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Veľmi pomalá"</item>
     <item msgid="2361722960903353554">"Pomalá"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Stredný"</item>
     <item msgid="2372711992605524591">"Dlhý"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Nikdy nekontrolovať"</item>
-    <item msgid="6042769699089883931">"Kontrolovať len obsah DRM"</item>
-    <item msgid="9174900380056846820">"Vždy kontrolovať"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Nikdy nepoužívať kontrolu HDCP"</item>
-    <item msgid="3878793616631049349">"Použiť kontrolu HDCP len pre obsah DRM"</item>
-    <item msgid="45075631231212732">"Vždy používať kontrolu HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 4eb0a20d..d6815c7 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Nastavenie globálneho servera proxy protokolu HTTP a zoznamu vylúčení"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Vymazať"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port proxy:"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Nepoužívať server proxy pre"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Obnoviť predvolené nastavenia"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Stav"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Rýchlosť pripojenia"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Adresa IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Metóda EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Overenie – 2. fáza"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certifikát CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Zadajte platnú adresu DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Zadajte dĺžku sieťovej predpony v rozsahu 0 až 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"Server DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"Server DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Brána"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Dĺžka sieťovej predpony"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prenosný prístupový bod Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Prenosný prístupový bod <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktívny"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Chyba prenosného prístupového bodu Wi-Fi"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Časový limit"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Obrazovka sa automaticky vypne po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Veľkosť písma"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Celková veľkosť písiem"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Vyberte veľkosť písma"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavenia zámky karty SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Nastavenia zámky karty SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zámka karty SIM"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Odstrániť"</string>
     <string name="misc_files" msgid="6298643430106707497">"Rôzne súbory"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"vybraté: <xliff:g id="NUMBER">%1$d</xliff:g> z <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Vybrať všetko"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Kontrola HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Nastaviť spôsob kontroly HDCP"</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index bf49a63..f38ab7e 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minut"</item>
     <item msgid="4322676235684793329">"30 minut"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Izredno majhna"</item>
+    <item msgid="383133849547816572">"Zelo majhna"</item>
+    <item msgid="6490061470416867723">"Majhna"</item>
+    <item msgid="3579015730662088893">"Običajna"</item>
+    <item msgid="1678068858001018666">"Velika"</item>
+    <item msgid="490158884605093126">"Zelo velika"</item>
+    <item msgid="2123802548987439763">"Izredno velika"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Zelo počasna"</item>
     <item msgid="2361722960903353554">"Počasna"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Srednja"</item>
     <item msgid="2372711992605524591">"Dolgo"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Nikoli ne preveri"</item>
-    <item msgid="6042769699089883931">"Preveri samo glede vsebine DRM"</item>
-    <item msgid="9174900380056846820">"Vedno preveri"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Nikoli ne uporabi preverjanja HDCP"</item>
-    <item msgid="3878793616631049349">"Preverjanje HDCP uporabi samo za vsebino DRM"</item>
-    <item msgid="45075631231212732">"Vedno uporabi preverjanje HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 68a5149..39e92e3 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Nastavi globalni strežnik HTTP proxy in seznam izločitev"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Počisti"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Vrata strežnika proxy"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Obidi strežnik proxy pri"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com, mycomp.test.com, localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Ponastavi na privzeto"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Stanje"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Hitrost povezave"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Naslov IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Način EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Preverjanje pristnosti v fazi 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Overjeno potrdilo"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Vnesite veljaven naslov DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Vnesite predpono omrežja, dolgo med 0 in 32 znaki."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Prehod"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Dolžina predpone omrežja"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prenosna brezžična dostopna točka"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Prenosna dostopna točka <xliff:g id="NETWORK_SSID">%1$s</xliff:g> dejavna"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Napaka prenosne brezžične dostopne dostopne točke"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Časovna omejitev"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Zaslon se samodejno izklopi po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Samodejna svetlost"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Velikost pisave"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Skupna velikost pisav"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Izbira velikosti pisave"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavitve zaklepanja kartice SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Nastavi zaklepanje kartice SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zaklepanje kartice SIM"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Izbriši"</string>
     <string name="misc_files" msgid="6298643430106707497">"Razne datoteke"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"izbrano: <xliff:g id="NUMBER">%1$d</xliff:g> od <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> od skupaj <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Izberi vse"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Preverjanje HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Nastavi preverjanje HDCP"</string>
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 0a8c493..08c53e5 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 минута"</item>
     <item msgid="4322676235684793329">"30 минута"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Изузетно мала"</item>
+    <item msgid="383133849547816572">"Веома мала"</item>
+    <item msgid="6490061470416867723">"Мала"</item>
+    <item msgid="3579015730662088893">"Нормална"</item>
+    <item msgid="1678068858001018666">"Велика"</item>
+    <item msgid="490158884605093126">"Веома велика"</item>
+    <item msgid="2123802548987439763">"Изузетно велика"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Веома споро"</item>
     <item msgid="2361722960903353554">"Полако"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Средње"</item>
     <item msgid="2372711992605524591">"Дугачко"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Никад не проверавај"</item>
-    <item msgid="6042769699089883931">"Потражи само DRM садржај"</item>
-    <item msgid="9174900380056846820">"Увек проверавај"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Никада не користи HDCP проверу"</item>
-    <item msgid="3878793616631049349">"Користи HDCP проверу само за DRM садржај"</item>
-    <item msgid="45075631231212732">"Увек користи HDCP проверу"</item>
-  </string-array>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index f23f092..e39afff 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Подесите глобални HTTP прокси и листе изузимања"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Обриши"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Прокси порт"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Прокси се заобилази за"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mojracunar.test.com,lokalnihost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Врати на подразумевано"</string>
@@ -298,7 +296,7 @@
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифровање"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Сачекајте да се таблет шифрује. Довршено је <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Сачекајте да се телефон шифрује. Довршено је <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Покушајте поново за <xliff:g id="DELAY">^1</xliff:g> секунди."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Покушајте поново за <xliff:g id="DELAY">^1</xliff:g> секунде(и)."</string>
     <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Унесите лозинку"</string>
     <string name="crypt_keeper_failed_title" msgid="1166918236711686187">"Шифровање није успело"</string>
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Шифровање је прекинуто и не може да се доврши. Потребно је да вратите фабричке податке (чиме ћете избрисати све податке) да бисте могли да наставите са коришћењем таблета. Можете поново да покушате да шифрујете таблет када се враћање фабричких података заврши."</string>
@@ -416,8 +414,8 @@
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Уређај <xliff:g id="DEVICE_NAME">%1$s</xliff:g> неће бити повезан на хендсфри звук."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Уређај  <xliff:g id="DEVICE_NAME">%1$s</xliff:g> неће бити повезан на улазнои уређај."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Приступ Интернету преко уређаја <xliff:g id="DEVICE_NAME">%1$s</xliff:g> биће онемогућен."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Дељење интернет везе са овим таблетом биће прекинуто за <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Дељење интернет везе са овим телефоном биће прекинуто за <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Дељење Интернет везе са овим таблетом биће прекинуто за <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Дељење Интернет везе са овим телефоном биће прекинуто за <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Опције за <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Радње уређаја"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Повежи"</string>
@@ -431,7 +429,7 @@
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Није повезано са сервером за пренос датотека"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Повезан са улазним уређајем"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Повез. са уређ. ради приступа Интернету"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Локална интернет веза се дели са уређајем"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Локална Интернет веза се дели са уређајем"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Коришћење за звук медија"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Коришћење за аудио телефона"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Коришћење за пренос датотека"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Статус"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Брзина везе"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP адреса"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP метод"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Потврда идентитета друге фазе"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA сертификат"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Унесите важећу DNS адресу."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Унесите префикс мреже дужине између 0 и 32 знака."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Мрежни пролаз"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Дужина префикса мреже"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Преносна Wi-Fi приступна тачка"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Преносна приступна тачка <xliff:g id="NETWORK_SSID">%1$s</xliff:g> је активна"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Грешка у преносној Wi-Fi приступној тачки"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Време чекања"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Екран се аутоматски искључује након <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Аутоматски ниво осветљености"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Величина фонта"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Општа величина фонтова"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Избор величине фонта"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Подешавања закључавања SIM картице"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Подешавање закључавања SIM картице"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Закључавање SIM картице"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Избриши"</string>
     <string name="misc_files" msgid="6298643430106707497">"Разне датотеке"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"изабрано је <xliff:g id="NUMBER">%1$d</xliff:g> од <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> од <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Изабери све"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP провера"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Подешав. понаш. HDCP пров."</string>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index fa12c42..aeb8b81 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minuter"</item>
     <item msgid="4322676235684793329">"30 minuter"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Mycket liten"</item>
+    <item msgid="383133849547816572">"Extra liten"</item>
+    <item msgid="6490061470416867723">"Liten"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Stor"</item>
+    <item msgid="490158884605093126">"Extra stor"</item>
+    <item msgid="2123802548987439763">"Mycket stor"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Mycket långsam"</item>
     <item msgid="2361722960903353554">"Långsam"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Mellan"</item>
     <item msgid="2372711992605524591">"Lång"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Kontrollera aldrig"</item>
-    <item msgid="6042769699089883931">"Kontrollera bara DRM-innehåll"</item>
-    <item msgid="9174900380056846820">"Kontrollera alltid"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Använd aldrig HDCP-kontroll"</item>
-    <item msgid="3878793616631049349">"Använd bara HDCP-kontroll för DRM-innehåll"</item>
-    <item msgid="45075631231212732">"Använd alltid HDCP-kontroll"</item>
-  </string-array>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 917f9ce..d1a1399 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Ange global HTTP-proxy och uteslutningslistor"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Rensa"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxyport"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Förbigå proxy för"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"exempel.se,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Återställ standardinställningar"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Länkhastighet"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP-adress"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP-metod"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Autentisering för fas 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-certifikat"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Ange en giltig DNS-adress."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Ange en nätverksprefixlängd mellan 0 och 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Nätverksprefixets längd"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Mobil Wi-Fi-surfpunkt"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Mobil surfpunkt <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktiv"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fel på mobil Wi-Fi-surfpunkt"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Tidsgräns"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Skärmen stängs av automatiskt efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk ljusstyrka"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Teckenstorlek"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Övergripande teckenstorlek"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Välj teckenstorlek"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Låsinställningar för SIM-kort"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ställ in lås för SIM-kort"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Lås för SIM-kort"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Ta bort"</string>
     <string name="misc_files" msgid="6298643430106707497">"Misc-filer"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> av <xliff:g id="TOTAL">%2$d</xliff:g> har valts"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> av <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Markera alla"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-kontroll"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Konfigurera HDCP-kontroll"</string>
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index ae51eef..5f7c773 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 นาที"</item>
     <item msgid="4322676235684793329">"30 นาที"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"เล็กมาก"</item>
+    <item msgid="383133849547816572">"เล็กพิเศษ"</item>
+    <item msgid="6490061470416867723">"เล็ก"</item>
+    <item msgid="3579015730662088893">"ปกติ"</item>
+    <item msgid="1678068858001018666">"ใหญ่"</item>
+    <item msgid="490158884605093126">"ใหญ่พิเศษ"</item>
+    <item msgid="2123802548987439763">"ใหญ่มาก"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"ช้ามาก"</item>
     <item msgid="2361722960903353554">"ช้า"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"ปานกลาง"</item>
     <item msgid="2372711992605524591">"ยาว"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"ไม่ต้องตรวจสอบ"</item>
-    <item msgid="6042769699089883931">"ตรวจสอบเนื้อหา DRM เท่านั้น"</item>
-    <item msgid="9174900380056846820">"ตรวจสอบทุกครั้ง"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"ห้ามใช้การตรวจสอบ HDCP"</item>
-    <item msgid="3878793616631049349">"ใช้การตรวจสอบ HDCP สำหรับเนื้อหา DRM เท่านั้น"</item>
-    <item msgid="45075631231212732">"ใช้การตรวจสอบ HDCP เสมอ"</item>
-  </string-array>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 933885d..958d85e 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"ตั้งค่าพร็อกซี HTTP ส่วนกลางและรายการยกเว้น"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"ล้างข้อมูล"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"พอร์ตพร็อกซี"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"ไม่ใช้พร็อกซีสำหรับ"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"คืนค่าเริ่มต้น"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"สถานะ"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"ความเร็วในการลิงก์"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"ที่อยู่ IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"วิธีการ EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"การตรวจสอบสิทธิ์เฟส 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"ใบรับรอง CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"โปรดพิมพ์ที่อยู่ DNS ที่ถูกต้อง"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"โปรดพิมพ์รหัสเครือข่ายระหว่าง 0 ถึง 32 อักขระ"</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"เกตเวย์"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"ความยาวของหมายเลขเครือข่าย"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Wi-Fi ฮอตสปอตแบบพกพา"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"ฮอตสปอตแบบพกพาได้ <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ทำงานอยู่"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"ข้อผิดพลาดของ Wi-Fi ฮอตสปอตแบบพกพา"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"ระยะหมดเวลา"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"หน้าจอปิดการทำงานโดยอัตโนมัติหลังจาก <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ปรับความสว่างอัตโนมัติ"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"ขนาดอักษร"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"ขนาดโดยรวมของอักษร"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"เลือกขนาดอักษร"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"การตั้งค่าการล็อกซิมการ์ด"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"ตั้งค่าการล็อกซิมการ์ด"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"การล็อกซิมการ์ด"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"ลบ"</string>
     <string name="misc_files" msgid="6298643430106707497">"ไฟล์เบ็ดเตล็ด"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"เลือก <xliff:g id="NUMBER">%1$d</xliff:g> จาก <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> จาก <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"เลือกทั้งหมด"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"การตรวจสอบ HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"ตั้งค่าการตรวจสอบ HDCP"</string>
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 772f990..68e0bfb 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 minuto"</item>
     <item msgid="4322676235684793329">"30 minuto"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Sobrang Liit"</item>
+    <item msgid="383133849547816572">"Sobrang Liit"</item>
+    <item msgid="6490061470416867723">"Maliit"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Malaki"</item>
+    <item msgid="490158884605093126">"Sobrang Laki"</item>
+    <item msgid="2123802548987439763">"Sobrang Laki"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Napakabagal"</item>
     <item msgid="2361722960903353554">"Mabagal"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Katamtaman"</item>
     <item msgid="2372711992605524591">"Mahaba"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Huwag kailanman suriin"</item>
-    <item msgid="6042769699089883931">"Suriin lang para sa nilalamang DRM"</item>
-    <item msgid="9174900380056846820">"Palaging suriin"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Huwag kailanman gumamit ng pagsusuring HDCP"</item>
-    <item msgid="3878793616631049349">"Gamitin lang ang pagsusuring HDCP para sa nilalamang DRM"</item>
-    <item msgid="45075631231212732">"Palaging gumamit ng pagsusuring HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 13991ba..687fac7 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Itakda ang pandaigdigang HTTP proxy at mga listahan ng pagbubukod"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"I-clear"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port ng proxy"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Bypass proxy para sa"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Ibalik ang mga default"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Katayuan"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"I-link ang bilis"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP address"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Pamamaraang EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Phase 2 na pagpapatotoo"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificate ng CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Mangyaring mag-type ng wastong dns address."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"I-type haba prefix ng network pagitan ng 0 at 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Haba ng prefix ng network"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Portable na Wi-Fi hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Ang Portable na hotspot na <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ay aktibo"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error sa portable na hotspot ng Wi-Fi"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Timeout"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Awtomatikong nag-o-off ang screen pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Awtomatikong pagliwanag"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Laki ng font"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Pangkalahatang laki ng mga font"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Pumili ng laki ng font"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Mga setting ng lock ng SIM card"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"I-set up ang lock ng SIM card"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Lock ng SIM card"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Tanggalin"</string>
     <string name="misc_files" msgid="6298643430106707497">"Misc na Mga File"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"pinili <xliff:g id="NUMBER">%1$d</xliff:g> sa <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> sa <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Piliin Lahat"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Pagsusuring HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Itakda kilos ng pagsusuri ng HDCP"</string>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index ba31802..a927e6c 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 dakika"</item>
     <item msgid="4322676235684793329">"30 dakika"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Çok Küçük"</item>
+    <item msgid="383133849547816572">"Ekstra Küçük"</item>
+    <item msgid="6490061470416867723">"Küçük"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Büyük"</item>
+    <item msgid="490158884605093126">"Ekstra Büyük"</item>
+    <item msgid="2123802548987439763">"Çok Büyük"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Çok yavaş"</item>
     <item msgid="2361722960903353554">"Yavaş"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Orta"</item>
     <item msgid="2372711992605524591">"Uzun"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Hiçbir zaman denetleme"</item>
-    <item msgid="6042769699089883931">"Yalnızca DRM içeriğini denetle"</item>
-    <item msgid="9174900380056846820">"Her zaman denetle"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"HDCP denetimini hiçbir zaman kullanma"</item>
-    <item msgid="3878793616631049349">"HDCP denetimini yalnızca DRM içeriği için kullan"</item>
-    <item msgid="45075631231212732">"HDCP denetimini her zaman kullan"</item>
-  </string-array>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 3a7afd7..b392525 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Genel HTTP proxy\'sini ve dışlama listelerini ayarla"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Temizle"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxy bağlantı noktası"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Şunlar için proxy\'yi atla"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,bilgisayarim.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Varsayılanları geri yükle"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Durum"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Bağlantı hızı"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP adresi"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP yöntemi"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Aşama 2 için kimlik doğrulaması"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA sertifikası"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Lütfen geçerli bir DNS adresi yazın."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Lütfen 0 ile 32 arasında bir ağ önek uzunluğu yazın."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Geçit"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Ağ önek uzunluğu"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Taşınabilir kablosuz ortak erişim noktası"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Taşınabilir ortak erişim noktası <xliff:g id="NETWORK_SSID">%1$s</xliff:g> etkin"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Taşınabilir kablosuz ortak erişim noktası hatası"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Zaman aşımı"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> sonra ekran otomatik olarak kapanır"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Otomatik parlaklık"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Yazı tipi boyutu"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Tüm yazı tipi boyutları"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Yazı tipini seçin"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kart kilit ayarları"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM kart kilidini ayarla"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM kart kilidi"</string>
@@ -685,7 +676,7 @@
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD kartının bağlantısını kes"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Dahili USB depolamanın bağ kes"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Güvenle çıkarabilmnz için SD kartın bağl kesin"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Bağlantı için USByi takın"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Bğl için USB dep brm takn"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Eklemek için bir SD kart yerleştirin"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USB depl birimini ekleyin"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"SD kartı ekle"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Sil"</string>
     <string name="misc_files" msgid="6298643430106707497">"Çeşitli Dosyalar"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"toplam <xliff:g id="TOTAL">%2$d</xliff:g> dosyadan <xliff:g id="NUMBER">%1$d</xliff:g> tanesi seçildi"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Tümünü Seç"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP denetimi"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP denetimini ayarla"</string>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 93701b3..3d10b18 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 хвилин"</item>
     <item msgid="4322676235684793329">"30 хвилин"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Малесенький"</item>
+    <item msgid="383133849547816572">"Дуже малий"</item>
+    <item msgid="6490061470416867723">"Малий"</item>
+    <item msgid="3579015730662088893">"Звичайний"</item>
+    <item msgid="1678068858001018666">"Великий"</item>
+    <item msgid="490158884605093126">"Дуже великий"</item>
+    <item msgid="2123802548987439763">"Величезний"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Дуже пов."</item>
     <item msgid="2361722960903353554">"Повіл."</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Середній"</item>
     <item msgid="2372711992605524591">"Довгий"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Ніколи не перевіряти"</item>
-    <item msgid="6042769699089883931">"Перевір. лише на вміст, захищ. DRM"</item>
-    <item msgid="9174900380056846820">"Завжди перевіряти"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Ніколи не використовувати перевірку HDCP"</item>
-    <item msgid="3878793616631049349">"Використовувати перевірку HDCP лише для вмісту, захищеного DRM"</item>
-    <item msgid="45075631231212732">"Завжди використовувати перевірку HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 22a5010..b6ef71d 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Устан. глоб. проксі-сервер HTTP й списки виключ."</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Очистити"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Порт проксі-сервера"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Обходити проксі-сервер для"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Відн. станд. знач."</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Стан"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Швид. зв\'язку"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"ІР-адреса"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Метод EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Друга фаза автентифікації"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Сертифікат ЦС"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Введіть дійсну DNS-адресу."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Введіть довжину префіксу мережі від 0 до 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Довжина префіксу мережі"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Портат. точка дост. Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Порт. точка дост. <xliff:g id="NETWORK_SSID">%1$s</xliff:g> активна"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Помилка порт. точки дост. Wi-Fi"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Час очікування"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Екран автоматично відключається через <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яскравість"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Розмір шрифту"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Загальний розмір шрифтів"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Виберіть розмір шрифту"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Налашт. блокув. SIM-карти"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Налашт. блок. SIM-карти"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Блок. SIM-карти"</string>
@@ -811,8 +802,8 @@
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Доступ до Інтернету через цей телефон"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Доступ до Інтернету через цей планшетний ПК для 1 пристрою"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Доступ до Інтернету через цей телефон для 1 пристрою"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Доступ до Інтернету через цей планшетний ПК для <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> пристр."</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Доступ до Інтернету через цей телефон для <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> пристр."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Доступ до Інтернету через цей планшет. ПК для <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> пристроїв"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Доступ до Інтернету через цей телефон для <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> пристроїв"</string>
     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Немає доступу до Інтернету через цей планшетний ПК"</string>
     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Немає доступу до Інтернету через цей телефон"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Помилка прив\'язки Bluetooth"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Видалити"</string>
     <string name="misc_files" msgid="6298643430106707497">"Інші файли"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"вибрано <xliff:g id="NUMBER">%1$d</xliff:g> з <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Вибрати все"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Перевірка HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Устан.режим перевірки HDCP"</string>
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index c873648..16066cf 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 phút"</item>
     <item msgid="4322676235684793329">"30 phút"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Cực nhỏ"</item>
+    <item msgid="383133849547816572">"Quá nhỏ"</item>
+    <item msgid="6490061470416867723">"Nhỏ"</item>
+    <item msgid="3579015730662088893">"Thường"</item>
+    <item msgid="1678068858001018666">"Lớn"</item>
+    <item msgid="490158884605093126">"Quá lớn"</item>
+    <item msgid="2123802548987439763">"Cực lớn"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Rất chậm"</item>
     <item msgid="2361722960903353554">"Chậm"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"Trung bình"</item>
     <item msgid="2372711992605524591">"Dài"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Không bao giờ kiểm tra"</item>
-    <item msgid="6042769699089883931">"Chỉ kiểm tra nội dung DRM"</item>
-    <item msgid="9174900380056846820">"Luôn kiểm tra"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Không bao giờ sử dụng kiểm tra HDCP"</item>
-    <item msgid="3878793616631049349">"Chỉ sử dụng kiểm tra HDCP cho nội dung DRM"</item>
-    <item msgid="45075631231212732">"Luôn sử dụng kiểm tra HDCP"</item>
-  </string-array>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a449f22..8a2fab8 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Đặt proxy HTTP chung và danh sách loại trừ"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Xoá"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Cổng proxy"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Bỏ qua proxy cho"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Khôi phục mặc định"</string>
@@ -430,8 +428,8 @@
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Đã kết nối với máy chủ chuyển tệp"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Chưa kết nối với máy chủ chuyển tệp"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Đã kết nối với thiết bị nhập"</string>
-    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Đã kết nối với thiết bị"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Chia sẻ kết nối Internet"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Đã kết nối với thiết bị để truy cập Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Chia sẻ kết nối Internet cục bộ với thiết bị"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Sử dụng cho âm thanh phương tiện"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Sử dụng cho âm thanh điện thoại"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Sử dụng để chuyển tệp"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"Trạng thái"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Tốc độ liên kết"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Địa chỉa IP"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"Phương pháp EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Xác thực Giai đoạn 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Chứng chỉ CA"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Vui lòng nhập địa chỉ dns hợp lệ."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Vui lòng nhập độ dài tiền tố mạng từ 0 đến 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"Cổng"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Độ dài tiền tố mạng"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Điểm phát sóng Wi-Fi di động"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Điểm phát sóng di động <xliff:g id="NETWORK_SSID">%1$s</xliff:g> hoạt động"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Lỗi điểm phát sóng Wi-Fi di động"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Thời gian chờ"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Màn hình tự động tắt sau <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Độ sáng tự động"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Kích thước phông chữ"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Kích thước phông chữ chung"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Chọn kích thước phông chữ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Cài đặt khoá thẻ SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Thiết lập khoá thẻ SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Khoá thẻ SIM"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"Xóa"</string>
     <string name="misc_files" msgid="6298643430106707497">"Tệp khác"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"đã chọn <xliff:g id="NUMBER">%1$d</xliff:g> trong tổng số <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> trong tổng số <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"Chọn tất cả"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"Kiểm tra HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Đặt hành vi kiểm tra HDCP"</string>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index c001714..8a10c92 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 分钟"</item>
     <item msgid="4322676235684793329">"30 分钟"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"极小"</item>
+    <item msgid="383133849547816572">"较小"</item>
+    <item msgid="6490061470416867723">"小"</item>
+    <item msgid="3579015730662088893">"正常"</item>
+    <item msgid="1678068858001018666">"大"</item>
+    <item msgid="490158884605093126">"较大"</item>
+    <item msgid="2123802548987439763">"极大"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"很慢"</item>
     <item msgid="2361722960903353554">"慢"</item>
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"中"</item>
     <item msgid="2372711992605524591">"长"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"一律不检查"</item>
-    <item msgid="6042769699089883931">"仅检查 DRM 内容"</item>
-    <item msgid="9174900380056846820">"总是检查"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"一律不使用 HDCP 检查"</item>
-    <item msgid="3878793616631049349">"仅使用 HDCP 检查 DRM 内容"</item>
-    <item msgid="45075631231212732">"始终使用 HDCP 检查"</item>
-  </string-array>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a56672f..988b49b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"设置全局 HTTP 代理和排除列表"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"清除"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"代理服务器端口"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"对以下对象绕过代理："</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"恢复默认设置"</string>
@@ -416,8 +414,8 @@
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>将与免提音频断开连接。"</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>将与输入设备断开连接。"</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"将断开 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的互联网访问。"</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 将断开而不再共享该平板电脑的互联网连接。"</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 将断开而不再共享该手机的互联网连接。"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 将断开该平板电脑的共享互联网连接。"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 将断开该手机的共享互联网连接。"</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>选项"</string>
     <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"设备操作"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"连接"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"状态消息"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"连接速度"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP 地址"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP 方法"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"阶段 2 身份验证"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA 证书"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"请键入有效的 DNS 地址。"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"请键入长度在 0 到 32 之间的网络前缀。"</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"域名 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"域名 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"网关"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"网络前缀长度"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"便携式 Wi-Fi 热点"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"便携式热点 <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 已启用"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"便携式 Wi-Fi 热点错误"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"超时"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"屏幕会在 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后自动关闭"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自动调整亮度"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"字体大小"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"整体字体大小"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"选择字体大小"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡锁定设置"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"设置 SIM 卡锁定"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM 卡锁定"</string>
@@ -809,10 +800,10 @@
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"蓝牙绑定"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"共享该平板电脑的互联网连接"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"共享该手机的互联网连接"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"将该平板电脑的互联网连接与 1 台设备共享"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"将该手机的互联网连接与 1 台设备共享"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"将该平板电脑的互联网连接与 <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> 台设备共享"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"将该手机的互联网连接与 <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> 台设备共享"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"将该平板电脑的互联网连接共享给 1 个设备"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"将该手机的互联网连接共享给 1 个设备"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"将该平板电脑的互联网连接共享给 <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> 个设备"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"将该手机的互联网连接共享给 <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> 个设备"</string>
     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"不共享该平板电脑的互联网连接"</string>
     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"不共享该手机的互联网连接"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"蓝牙绑定出错"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"删除"</string>
     <string name="misc_files" msgid="6298643430106707497">"其他文件"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"已选择 <xliff:g id="NUMBER">%1$d</xliff:g> 个，共 <xliff:g id="TOTAL">%2$d</xliff:g> 个"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>，共 <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"全选"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP 检查"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"设置 HDCP 检查行为"</string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 3cc5f05..efb8409 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -59,6 +59,22 @@
     <item msgid="9002737361305019353">"10 分鐘"</item>
     <item msgid="4322676235684793329">"30 分鐘"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"最小"</item>
+    <item msgid="383133849547816572">"較小"</item>
+    <item msgid="6490061470416867723">"小"</item>
+    <item msgid="3579015730662088893">"一般"</item>
+    <item msgid="1678068858001018666">"大"</item>
+    <item msgid="490158884605093126">"較大"</item>
+    <item msgid="2123802548987439763">"最大"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"非常慢"</item>
     <item msgid="2361722960903353554">"慢"</item>
@@ -194,9 +210,9 @@
     <item msgid="4498124044785815005">"讓系統決定"</item>
   </string-array>
   <string-array name="vibrate_entries">
-    <item msgid="3388952299521009213">"一律"</item>
+    <item msgid="3388952299521009213">"永遠要"</item>
     <item msgid="6293147072807231256">"永遠不要"</item>
-    <item msgid="1276641209451816572">"僅在靜音模式時震動"</item>
+    <item msgid="1276641209451816572">"僅適用於靜音模式"</item>
     <item msgid="8418930333779132418">"僅適用於非靜音模式"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
@@ -204,14 +220,4 @@
     <item msgid="2560532955514699713">"中"</item>
     <item msgid="2372711992605524591">"長"</item>
   </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"不要檢查"</item>
-    <item msgid="6042769699089883931">"僅檢查 DRM 內容"</item>
-    <item msgid="9174900380056846820">"一律檢查"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"不使用 HDCP 檢查"</item>
-    <item msgid="3878793616631049349">"僅使用 HDCP 檢查 DRM 內容"</item>
-    <item msgid="45075631231212732">"一律使用 HDCP 檢查"</item>
-  </string-array>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 841a64d..dcfeec1 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -148,8 +148,6 @@
     <string name="proxy_settings_summary" msgid="7898928000758321486">"設定全域 HTTP Proxy 和排除清單"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"清除"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxy 通訊埠"</string>
-    <!-- no translation found for proxy_port_hint (56832878488386205) -->
-    <skip />
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"略過以下 Proxy："</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"還原預設值"</string>
@@ -238,7 +236,7 @@
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"停用無線網路連線中..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"啟用無線網路連線中..."</string>
     <string name="radio_controls_title" msgid="5868688473587168882">"無線與網路"</string>
-    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"無線與網路"</string>
+    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"無線裝置與網路"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"管理 Wi-Fi、藍牙、飛行模式、行動網路和 VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"漫游服務"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"漫遊時連線到資料傳輸服務"</string>
@@ -480,8 +478,6 @@
     <string name="wifi_status" msgid="4824568012414605414">"狀態"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"連線速度"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP 位址"</string>
-    <!-- no translation found for wifi_ip_address_hint (8743430259685731436) -->
-    <skip />
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP 方法"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"階段 2 驗證"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA 憑證"</string>
@@ -519,17 +515,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"請輸入有效的 DNS 位址。"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"請輸入長度介於 0 到 32 之間的網路首碼。"</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
-    <!-- no translation found for wifi_dns1_hint (6456813483795602877) -->
-    <skip />
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
-    <!-- no translation found for wifi_dns2_hint (7619765588130757472) -->
-    <skip />
     <string name="wifi_gateway" msgid="163914742461092086">"閘道"</string>
-    <!-- no translation found for wifi_gateway_hint (8795112538577969474) -->
-    <skip />
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"網路首碼長度"</string>
-    <!-- no translation found for wifi_network_prefix_length_hint (5443152484519915633) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"可攜式 Wi-Fi 無線基地台"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"可攜式無線基地台 <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 已啟用"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"可攜式 Wi-Fi 無線基地台發生錯誤"</string>
@@ -611,6 +599,9 @@
     <string name="screen_timeout" msgid="6962654593018319466">"逾時"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後自動關閉螢幕"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"字型大小"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"整體字型大小"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"選取字型大小"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡鎖定設定"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"設定 SIM 卡鎖定"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM 卡鎖定"</string>
@@ -745,7 +736,7 @@
     <string name="restore_default_apn" msgid="2724583218635739913">"正在還原預設 APN 設定"</string>
     <string name="menu_restore" msgid="8260067415075573273">"還原為預設狀態"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"重設預設 APN 設定已完成"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"恢復原廠設定"</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"重設為原廠設定"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"清除平板電腦上的所有資料"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"清除手機上所有資料"</string>
     <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包含："\n\n<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
@@ -782,31 +773,31 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"您必須繪製解鎖圖形，以確認要清除 SD 卡。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"設定語音信箱、來電轉接、來電待接及本機號碼顯示"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 網路共用"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 數據連線"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"可攜式無線基地台"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth 網路共用"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"網路共用"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"網路共用與可攜式無線基地台"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"藍牙數據連線"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"數據連線"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"數據連線與可攜式無線基地台"</string>
     <string name="tether_settings_summary_usb" product="tablet" msgid="785883365108362248">"透過 USB 分享平板電腦的行動數據連線"</string>
-    <string name="tether_settings_summary_usb" product="default" msgid="3562431455625637370">"透過 USB 分享手機的行動網路共用"</string>
+    <string name="tether_settings_summary_usb" product="default" msgid="3562431455625637370">"透過 USB 分享手機的行動數據連線"</string>
     <string name="tether_settings_summary_wifi" msgid="5474383125137372164">"透過可攜式 Wi-Fi 無線基地台方式，分享行動數據連線"</string>
     <string name="tether_settings_summary_bluetooth" msgid="2407506656353819750">"透過藍牙分享行動數據連線"</string>
     <string name="tether_settings_summary_usb_wifi" product="tablet" msgid="3834674129575844910">"透過 USB 或可攜式 Wi-Fi 無線基地台方式，分享平板電腦的行動數據連線"</string>
-    <string name="tether_settings_summary_usb_wifi" product="default" msgid="3700323208282018772">"透過 USB 或可攜式 Wi-Fi 無線基地台方式，分享手機的行動網路共用"</string>
+    <string name="tether_settings_summary_usb_wifi" product="default" msgid="3700323208282018772">"透過 USB 或可攜式 Wi-Fi 無線基地台方式，分享手機的行動數據連線"</string>
     <string name="tether_settings_summary_usb_bluetooth" product="tablet" msgid="1245080236509560839">"透過 USB 或藍牙分享平板電腦的行動數據連線"</string>
     <string name="tether_settings_summary_usb_bluetooth" product="default" msgid="4008195891276675882">"透過 USB 或藍牙分享手機的行動數據連線"</string>
     <string name="tether_settings_summary_wifi_bluetooth" product="tablet" msgid="1924576461932311140">"透過藍牙或可攜式 Wi-Fi 無線基地台方式，分享平板電腦的行動數據連線"</string>
-    <string name="tether_settings_summary_wifi_bluetooth" product="default" msgid="2753904149495692201">"透過 Bluetooth 或可攜式 Wi-Fi 無線基地台方式，分享手機的行動數據連線"</string>
+    <string name="tether_settings_summary_wifi_bluetooth" product="default" msgid="2753904149495692201">"透過藍牙或可攜式 Wi-Fi 無線基地台方式，分享手機的行動數據連線"</string>
     <string name="tether_settings_summary_all" product="tablet" msgid="6612660164315153427">"透過 USB、WiFi 或藍牙分享平板電腦的行動數據連線"</string>
     <string name="tether_settings_summary_all" product="default" msgid="1171769255924636665">"透過 USB、WiFi 或藍牙分享手機的行動數據連線"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB 網路共用"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"已連接 USB，選取即可進行網路共用"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"網路已共用"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"使用 USB 儲存裝置時無法進行網路共用"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB 數據連線"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"已連接 USB，選取即可進行數據連線"</string>
+    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"數據已連線"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"使用 USB 儲存裝置時無法進行數據連線"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB 尚未連線"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB 網路共用發生錯誤"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth 網路共用"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB 數據連線發生錯誤"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"藍牙數據連線"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"分享這個平板電腦的網際網路連線"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"分享這支手機的網際網路連線"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"與 1 個裝置分享這個平板電腦的網際網路連線"</string>
@@ -815,9 +806,9 @@
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"與 <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> 個裝置分享這支手機的網際網路連線"</string>
     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"未分享這個平板電腦的網際網路連線"</string>
     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"未分享這支手機的網際網路連線"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Bluetooth 網路共用線發生錯誤"</string>
-    <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"最多只能讓 <xliff:g id="MAXCONNECTION">%1$d</xliff:g> 個裝置進行網路共用"</string>
-    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的網路共用。"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"藍牙數據連線發生錯誤"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"最多只能連線至 <xliff:g id="MAXCONNECTION">%1$d</xliff:g> 個裝置"</string>
+    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的數據連線。"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"說明"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"行動網路"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"設定漫遊、網路、APN 選項"</string>
@@ -1442,8 +1433,7 @@
     <string name="delete" msgid="4219243412325163003">"刪除"</string>
     <string name="misc_files" msgid="6298643430106707497">"其他檔案"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"已選取 <xliff:g id="NUMBER">%1$d</xliff:g> 個，共 <xliff:g id="TOTAL">%2$d</xliff:g> 個"</string>
-    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>，總共 <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
     <string name="select_all" msgid="6783085295161532497">"全選"</string>
-    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP 檢查"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"設定 HDCP 檢查行為"</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 482830c..db53501 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -137,6 +137,26 @@
         <item>1800000</item>
     </string-array>
     
+    <string-array name="entries_font_size">
+        <item>Extremely Small</item>
+        <item>Extra Small</item>
+        <item>Small</item>
+        <item>Normal</item>
+        <item>Large</item>
+        <item>Extra Large</item>
+        <item>Extremely Large</item>
+    </string-array>
+
+    <string-array name="entryvalues_font_size">
+        <item>0.70</item>
+        <item>0.85</item>
+        <item>0.95</item>
+        <item>1.0</item>
+        <item>1.05</item>
+        <item>1.15</item>
+        <item>1.30</item>
+    </string-array>
+    
     <!-- TTS settings -->
 
     <!-- Default speech rate choices -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 80f3d57..f36c8a2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -313,8 +313,8 @@
     <string name="proxy_clear_text">Clear</string>
     <!-- HTTP proxy settings. The port number label. -->
     <string name="proxy_port_label">Proxy port</string>
-    <!-- HTTP proxy settings. The hint text field for port. [CHAR LIMIT=50]-->
-    <string name="proxy_port_hint">8080</string>
+    <!-- HTTP proxy settings. The hint text field for port. -->
+    <string name="proxy_port_hint" translatable="false">8080</string>
     <!-- HTTP proxy settings. The exclusion list label. -->
     <string name="proxy_exclusionlist_label">Bypass proxy for</string>
     <!-- HTTP proxy settings. The hint text for proxy exclusion list. [CHAR LIMIT=50]-->
@@ -1100,8 +1100,8 @@
     <string name="wifi_speed">Link speed</string>
     <!-- Label for the IP address of the connection -->
     <string name="wifi_ip_address">IP address</string>
-    <!-- Hint text for the IP address [CHAR LIMIT=25]-->
-    <string name="wifi_ip_address_hint">192.168.1.128</string>
+    <!-- Hint text for the IP address -->
+    <string name="wifi_ip_address_hint" translatable="false">192.168.1.128</string>
     <!-- Label for the EAP method of the network -->
     <string name="wifi_eap_method">EAP method</string>
     <!-- Label for the phase2 -->
@@ -1181,20 +1181,20 @@
     <string name="wifi_ip_settings_invalid_network_prefix_length">Please type a network prefix length between 0 and 32.</string>
     <!-- Label for the DNS (first one) -->
     <string name="wifi_dns1">DNS 1</string>
-    <!-- Hint text for DNS [CHAR LIMIT=25]-->
-    <string name="wifi_dns1_hint">8.8.8.8</string>
+    <!-- Hint text for DNS -->
+    <string name="wifi_dns1_hint" translatable="false">8.8.8.8</string>
     <!-- Label for the DNS (second one)-->
     <string name="wifi_dns2">DNS 2</string>
-    <!-- Hint text for DNS [CHAR LIMIT=25]-->
-    <string name="wifi_dns2_hint">4.4.4.4</string>
+    <!-- Hint text for DNS -->
+    <string name="wifi_dns2_hint" translatable="false">4.4.4.4</string>
     <!-- Label for the gateway of the network -->
     <string name="wifi_gateway">Gateway</string>
-    <!-- Hint text for the gateway [CHAR LIMIT=25]-->
-    <string name="wifi_gateway_hint">192.168.1.1</string>
+    <!-- Hint text for the gateway -->
+    <string name="wifi_gateway_hint" translatable="false">192.168.1.1</string>
     <!-- Label for the network prefix of the network [CHAR LIMIT=25]-->
     <string name="wifi_network_prefix_length">Network prefix length</string>
-    <!-- Hint text for network prefix length [CHAR LIMIT=25] -->
-    <string name="wifi_network_prefix_length_hint">24</string>
+    <!-- Hint text for network prefix length -->
+    <string name="wifi_network_prefix_length_hint" translatable="false">24</string>
 
     <!-- Wifi AP settings-->
     <!-- Label for wifi tether checkbox. Toggles Access Point on/off -->
@@ -1450,6 +1450,12 @@
     <string name="screen_timeout_summary">Screen turns off automatically after <xliff:g id="timeout_description">%1$s</xliff:g></string>
     <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
     <string name="automatic_brightness">Automatic brightness</string>
+    <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
+    <string name="title_font_size">Font size</string>
+    <!-- [CHAR LIMIT=40] Sound & display settings screen, setting option summary to change font size -->
+    <string name="summary_font_size">Overall size of fonts</string>
+    <!-- [CHAR LIMIT=40] Sound & display settings screen, title of dialog for picking font size -->
+    <string name="dialog_title_font_size">Select font size</string>
 
     <!-- SIM lock settings title -->
     <string name="sim_lock_settings">SIM card lock settings</string>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 7fe7f76..5e2d76e 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -41,4 +41,13 @@
                 android:persistent="false"
                 android:entries="@array/screen_timeout_entries"
                 android:entryValues="@array/screen_timeout_values" />
+                
+        <ListPreference
+                android:key="font_size"
+                android:title="@string/title_font_size"
+                android:summary="@string/summary_font_size"
+                android:entries="@array/entries_font_size"
+                android:entryValues="@array/entryvalues_font_size"
+                android:dialogTitle="@string/dialog_title_font_size" />
+        
 </PreferenceScreen>
diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java
index ec9c2af..dffbab3 100644
--- a/src/com/android/settings/DateTimeSettingsSetupWizard.java
+++ b/src/com/android/settings/DateTimeSettingsSetupWizard.java
@@ -27,7 +27,6 @@
 import android.os.Bundle;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
-import android.text.format.DateFormat;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -41,6 +40,7 @@
 import android.widget.DatePicker;
 import android.widget.ListPopupWindow;
 import android.widget.SimpleAdapter;
+import android.widget.TextView;
 import android.widget.TimePicker;
 
 import java.util.Calendar;
@@ -119,8 +119,9 @@
 
         mAutoDateTimeButton = (CompoundButton)findViewById(R.id.date_time_auto_button);
         mAutoDateTimeButton.setChecked(autoDateTimeEnabled);
-        mAutoDateTimeButton.setText(autoDateTimeEnabled ? R.string.date_time_auto_summaryOn :
-                R.string.date_time_auto_summaryOff);
+        ((TextView)findViewById(R.id.date_time_auto_text))
+                .setText(autoDateTimeEnabled ? R.string.date_time_auto_summaryOn :
+                        R.string.date_time_auto_summaryOff);
         mAutoDateTimeButton.setOnCheckedChangeListener(this);
 
         mTimePicker = (TimePicker)findViewById(R.id.time_picker);
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index cdb0147..68d4495 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -18,9 +18,11 @@
 
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
 
+import android.app.ActivityManagerNative;
 import android.app.admin.DevicePolicyManager;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.database.ContentObserver;
 import android.os.Bundle;
 import android.os.Handler;
@@ -46,11 +48,15 @@
     private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
     private static final String KEY_ANIMATIONS = "animations";
     private static final String KEY_ACCELEROMETER = "accelerometer";
+    private static final String KEY_FONT_SIZE = "font_size";
 
     private ListPreference mAnimations;
     private CheckBoxPreference mAccelerometer;
     private float[] mAnimationScales;
+    private ListPreference mFontSizePref;
 
+    private final Configuration mCurConfig = new Configuration();
+    
     private IWindowManager mWindowManager;
 
     private ListPreference mScreenTimeoutPreference;
@@ -70,6 +76,12 @@
 
         addPreferencesFromResource(R.xml.display_settings);
 
+        // Fetch this once before attaching a listener for changes.
+        try {
+            mAnimationScales = mWindowManager.getAnimationScales();
+        } catch (RemoteException e) {
+            // Shouldn't happen and not much can be done anyway.
+        }
         mAnimations = (ListPreference) findPreference(KEY_ANIMATIONS);
         mAnimations.setOnPreferenceChangeListener(this);
         mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
@@ -82,6 +94,9 @@
         mScreenTimeoutPreference.setOnPreferenceChangeListener(this);
         disableUnusableTimeouts(mScreenTimeoutPreference);
         updateTimeoutPreferenceDescription(resolver, currentTimeout);
+        
+        mFontSizePref = (ListPreference) findPreference(KEY_FONT_SIZE);
+        mFontSizePref.setOnPreferenceChangeListener(this);
     }
 
     private void updateTimeoutPreferenceDescription(ContentResolver resolver, long currentTimeout) {
@@ -135,6 +150,29 @@
         screenTimeoutPreference.setEnabled(revisedEntries.size() > 0);
     }
 
+    int floatToIndex(float val, int resid) {
+        String[] indices = getResources().getStringArray(resid);
+        float lastVal = Float.parseFloat(indices[0]);
+        for (int i=1; i<indices.length; i++) {
+            float thisVal = Float.parseFloat(indices[i]);
+            if (val < (lastVal + (thisVal-lastVal)*.5f)) {
+                return i-1;
+            }
+            lastVal = thisVal;
+        }
+        return indices.length-1;
+    }
+    
+    public void readFontSizePreference(ListPreference pref) {
+        try {
+            mCurConfig.updateFrom(
+                ActivityManagerNative.getDefault().getConfiguration());
+        } catch (RemoteException e) {
+        }
+        pref.setValueIndex(floatToIndex(mCurConfig.fontScale,
+                R.array.entryvalues_font_size));
+    }
+    
     @Override
     public void onResume() {
         super.onResume();
@@ -157,6 +195,7 @@
         try {
             mAnimationScales = mWindowManager.getAnimationScales();
         } catch (RemoteException e) {
+            // Shouldn't happen and not much can be done anyway.
         }
         if (mAnimationScales != null) {
             if (mAnimationScales.length >= 1) {
@@ -179,6 +218,7 @@
         mAnimations.setValueIndex(idx);
         updateAnimationsSummary(mAnimations.getValue());
         updateAccelerometerRotationCheckbox();
+        readFontSizePreference(mFontSizePref);
     }
 
     private void updateAccelerometerRotationCheckbox() {
@@ -200,6 +240,14 @@
         }
     }
 
+    public void writeFontSizePreference(Object objValue) {
+        try {
+            mCurConfig.fontScale = Float.parseFloat(objValue.toString());
+            ActivityManagerNative.getDefault().updateConfiguration(mCurConfig);
+        } catch (RemoteException e) {
+        }
+    }
+    
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference == mAccelerometer) {
@@ -241,6 +289,9 @@
                 Log.e(TAG, "could not persist screen timeout setting", e);
             }
         }
+        if (KEY_FONT_SIZE.equals(key)) {
+            writeFontSizePreference(objValue);
+        }
 
         return true;
     }
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 2532747..c68ea5d 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -229,6 +229,15 @@
         return super.onGetInitialHeader();
     }
 
+    @Override
+    public Intent onBuildStartFragmentIntent(String fragmentName, Bundle args,
+            int titleRes, int shortTitleRes) {
+        Intent intent = super.onBuildStartFragmentIntent(fragmentName, args,
+                titleRes, shortTitleRes);
+        intent.setClass(this, SubSettings.class);
+        return intent;
+    }
+    
     /**
      * Populate the activity with the top-level headers.
      */
diff --git a/src/com/android/settings/SubSettings.java b/src/com/android/settings/SubSettings.java
new file mode 100644
index 0000000..9cd3c31
--- /dev/null
+++ b/src/com/android/settings/SubSettings.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+/**
+ * Stub class for showing sub-settings; we can't use the main Settings class
+ * since for our app it is a special singleTask class.
+ */
+public class SubSettings extends Settings {
+}
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index b265362..c9bc758 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -70,12 +70,6 @@
         sNetworkStateMap.put(DetailedState.FAILED, DetailedState.FAILED);
     }
 
-    /**
-     * Used with {@link Button#setTag(Object)} to remember "Connect" button is pressed in
-     * with "add network" flow.
-     */
-    private static final int CONNECT_BUTTON_TAG_ADD_NETWORK = 1;
-
     private WifiSettings mWifiSettings;
     private WifiManager mWifiManager;
 
@@ -161,7 +155,7 @@
 
         // At first, Wifi module doesn't return SCANNING state (it's too early), so we manually
         // show it.
-        showScanningProgressBar();
+        showScanningState();
     }
 
     private void initViews() {
@@ -278,17 +272,16 @@
 
         switch (state) {
         case SCANNING: {
-            // Let users know the device is working correctly though currently there's
-            // no visible network on the list.
-            if (mWifiSettings.getAccessPointsCount() == 0) {
-                showScanningState();
-            } else {
-                // Users already see available networks.
-                showDisconnectedProgressBar();
-                if (mScreenState == SCREEN_STATE_DISCONNECTED) {
+            if (mScreenState == SCREEN_STATE_DISCONNECTED) {
+                if (mWifiSettings.getAccessPointsCount() == 0) {
+                    showScanningState();                    
+                } else {
+                    showDisconnectedProgressBar();
                     mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
                     mBottomPadding.setVisibility(View.GONE);
                 }
+            } else {
+                showDisconnectedProgressBar();
             }
             break;
         }
@@ -303,7 +296,8 @@
             break;
         }
         default:  // DISCONNECTED, FAILED
-            if (mScreenState != SCREEN_STATE_CONNECTED) {
+            if (mScreenState != SCREEN_STATE_CONNECTED &&
+                    mWifiSettings.getAccessPointsCount() > 0) {
                 showDisconnectedState(Summary.get(this, state));
             }
             break;
@@ -313,7 +307,8 @@
 
     private void showDisconnectedState(String stateString) {
         showDisconnectedProgressBar();
-        if (mScreenState == SCREEN_STATE_DISCONNECTED) {
+        if (mScreenState == SCREEN_STATE_DISCONNECTED &&
+                mWifiSettings.getAccessPointsCount() > 0) {
             mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
             mBottomPadding.setVisibility(View.GONE);
         }
@@ -461,13 +456,11 @@
         parent.removeAllViews();
         mWifiConfig = new WifiConfigUiForSetupWizardXL(this, parent, selectedAccessPoint, edit);
 
-        // Tag will be updated in this method when needed.
-        mConnectButton.setTag(null);
         if (selectedAccessPoint == null) {  // "Add network" flow
             showAddNetworkTitle();
             mConnectButton.setVisibility(View.VISIBLE);
-            mConnectButton.setTag(CONNECT_BUTTON_TAG_ADD_NETWORK);
 
+            showDisconnectedProgressBar();
             showEditingButtonState();
         } else if (selectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
             mNetworkName = selectedAccessPoint.getTitle().toString();
@@ -477,6 +470,7 @@
         } else {
             mNetworkName = selectedAccessPoint.getTitle().toString();
             showEditingTitle();
+            showDisconnectedProgressBar();
             showEditingButtonState();
             if (selectedAccessPoint.security == AccessPoint.SECURITY_EAP) {
                 onEapNetworkSelected();
@@ -632,8 +626,9 @@
             mAddNetworkButton.setEnabled(true);
             mRefreshButton.setEnabled(true);
             mSkipOrNextButton.setEnabled(true);
-            mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
             showDisconnectedProgressBar();
+            mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
+            mBottomPadding.setVisibility(View.GONE);
         }
 
         setPaddingVisibility(View.VISIBLE);
@@ -680,15 +675,7 @@
     }
 
     private void refreshAccessPoints(boolean disconnectNetwork) {
-        final Object tag = mConnectButton.getTag();
-        if (tag != null && (tag instanceof Integer) &&
-                ((Integer)tag == CONNECT_BUTTON_TAG_ADD_NETWORK)) {
-            // In "Add network" flow, we won't get DetaledState available for changing ProgressBar
-            // state. Instead we manually show previous status here.
-            showDisconnectedState(Summary.get(this, mPreviousNetworkState));
-        } else {
-            showScanningState();
-        }
+        showScanningState();
 
         if (disconnectNetwork) {
             mWifiManager.disconnect();