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..25fc24c 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>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index fe77673..49938e6 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@50ef5502)  -->
     <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>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 084eb86..5b4ceaa 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>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index f52f396..70f9502 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>
@@ -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>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index f1a69f9..7e0c786 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>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4cd2e5d..54c40f6 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>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 2beb22a..639e8dd 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>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6eaa176..49ab295 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>
@@ -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>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 7e162d5..40356e4 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>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 18b8c1e..0df3dab 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>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 16f412e..886aef5 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">"Sehr 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">"Sehr 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>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 67fb24f..09d30b5 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>
@@ -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>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 1251358..3751e99 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>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7c62c58..9fd17ec 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>
@@ -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>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 96e9bc8..08661be 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>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e5016f6..ef20ea3 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>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 3a662b0..74886e5 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>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1ff7825..4b3323c 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>
@@ -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>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 0fc04fe..cd4c317 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">"Pequeñísima"</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">"Grandísima"</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>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 012f387..b33484a 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>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index bbd7880..1fda5c5 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>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d57b0f3..91e8f2e 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>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index c6177f8..5500af9 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>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 9d94c62..02b4a26 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>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index cd1559b..108475b 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>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6e5a703..87992f4 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>
@@ -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>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 1cfe07f..df84e1b 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>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index f9ad372..eede907 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>
@@ -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>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index a00d7e7..59b1611 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>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 0635f85..df67226 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>
@@ -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>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index a281070..f4c8ea7 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>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a62d5a8..52d2db8 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>
@@ -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>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index ecef4cf..ff5e4bf 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>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f5e4dbf..058760c 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>
@@ -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>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index e58814e..9e118de 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>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 1118044..0f7c9e6 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>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index f31dad3..f0c78ef 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>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 21e2ddb..de5e95b 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>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 664dd8c..63ac805 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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index be574ac..8d4c916 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>
@@ -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>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 88eedf3..4a6d527 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>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2d7b920..8c4fd27 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>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 23ef36d..2fa784d 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>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 24bd0f9..ec76b94 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>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 6782cea..cb8caa9 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>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4bbfe4e..0ba714b 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>
@@ -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>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index d4137cc..6844718 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>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index fca5e27..55ad217 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>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 2e70088..a66a954 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>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4fafdab..dcfc0ba 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>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 396f112..5f0fd64 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>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b549dd7..465ba69 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>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 3a51c72..595fb00 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>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 48956e9..37c78e2 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>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index 9761244..a253354 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>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index f77730e..beec495 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>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index a501017..748fb60 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>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 5b27a51..55f082d 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>
@@ -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>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 884a78c..8c686c6 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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f4784de..62b816f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/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">"Сертификат центра сертификации"</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>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 0c38bf1..56da651 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>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 4eb0a20d..655c65e 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>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index bf49a63..eb82c67 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>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 68a5149..acd8ef0 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>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 0a8c493..f3c44d6 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>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index f23f092..cca4dc5 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>
@@ -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>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index fa12c42..d1046ef 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>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 917f9ce..5982652 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>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index ae51eef..a9f105c 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>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 933885d..8b86be9 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>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 772f990..3456038 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>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 13991ba..0514ad2 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>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index ba31802..f1fd3d8 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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 3a7afd7..76a3835 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>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 93701b3..3ebb92c 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>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 22a5010..5ae118f 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>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index c873648..648ddb3 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>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a449f22..b1b5199 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>
@@ -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>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index c001714..6c83ae3 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>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a56672f..3bd6349 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>
@@ -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>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 3cc5f05..e9f2fa1 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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 841a64d..076e734 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>
@@ -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>
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..d42be7c 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>
@@ -2102,6 +2108,10 @@
  from unknown sources. You agree that you are solely responsible for any
  damage to your phone or loss of data that may result from using
  these applications.</string>
+    <!-- Applications settings screen, setting check box title. If checked, applications show more settings options. -->
+    <string name="advanced_settings">Advanced settings</string>
+    <!-- Applications settings screen, setting check box summary.  This is the summary for "Advanced settings" checkbox  -->
+    <string name="advanced_settings_summary">Enable more settings options.</string>
     <!-- Manage applications, individual application info screen title. For example, if they click on "Browser" in "Manage applications", the title of the next screen will be this -->
     <string name="application_info_label">Application info</string>
     <!-- Manage applications, individual application info screen, section heading for stuff relating to an app's storage settings. -->
diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml
index 4e77a93..3ad1e5d 100644
--- a/res/xml/application_settings.xml
+++ b/res/xml/application_settings.xml
@@ -54,6 +54,13 @@
             android:summaryOn="@string/install_unknown_applications"
             android:persistent="false" />
 
+    <CheckBoxPreference
+            android:key="toggle_advanced_settings"
+            android:title="@string/advanced_settings"
+            android:summaryOff="@string/advanced_settings_summary"
+            android:summaryOn="@string/advanced_settings_summary"
+            android:persistent="false" />
+
     <ListPreference
         android:key="app_install_location"
         android:title="@string/app_install_location_title"
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/ApplicationSettings.java b/src/com/android/settings/ApplicationSettings.java
index da417ec..bb0f66f 100644
--- a/src/com/android/settings/ApplicationSettings.java
+++ b/src/com/android/settings/ApplicationSettings.java
@@ -18,6 +18,7 @@
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
@@ -26,11 +27,13 @@
 import android.preference.PreferenceScreen;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.provider.Settings;
+import android.util.Log;
 
 public class ApplicationSettings extends SettingsPreferenceFragment implements
         DialogInterface.OnClickListener {
     
     private static final String KEY_TOGGLE_INSTALL_APPLICATIONS = "toggle_install_applications";
+    private static final String KEY_TOGGLE_ADVANCED_SETTINGS = "toggle_advanced_settings";
     private static final String KEY_APP_INSTALL_LOCATION = "app_install_location";
 
     // App installation location. Default is ask the user.
@@ -43,9 +46,8 @@
     private static final String APP_INSTALL_AUTO_ID = "auto";
     
     private CheckBoxPreference mToggleAppInstallation;
-
+    private CheckBoxPreference mToggleAdvancedSettings;
     private ListPreference mInstallLocation;
-
     private DialogInterface mWarnInstallApps;
 
     @Override
@@ -54,9 +56,19 @@
 
         addPreferencesFromResource(R.xml.application_settings);
 
-        mToggleAppInstallation = (CheckBoxPreference) findPreference(KEY_TOGGLE_INSTALL_APPLICATIONS);
+        mToggleAppInstallation = (CheckBoxPreference)findPreference(
+                KEY_TOGGLE_INSTALL_APPLICATIONS);
         mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());
 
+        mToggleAdvancedSettings = (CheckBoxPreference)findPreference(
+                KEY_TOGGLE_ADVANCED_SETTINGS);
+        mToggleAdvancedSettings.setChecked(isAdvancedSettingsEnabled());
+
+        // not ready for prime time yet
+        if (false) {
+            getPreferenceScreen().removePreference(mInstallLocation);
+        }
+
         mInstallLocation = (ListPreference) findPreference(KEY_APP_INSTALL_LOCATION);
         // Is app default install location set?
         boolean userSetInstLocation = (Settings.System.getInt(getContentResolver(),
@@ -110,6 +122,9 @@
             } else {
                 setNonMarketAppsAllowed(false);
             }
+        } else if (preference == mToggleAdvancedSettings) {
+            boolean value = mToggleAdvancedSettings.isChecked();
+            setAdvancedSettingsEnabled(value);
         }
 
         return super.onPreferenceTreeClick(preferenceScreen, preference);
@@ -127,7 +142,23 @@
         Settings.Secure.putInt(getContentResolver(), Settings.Secure.INSTALL_NON_MARKET_APPS, 
                                 enabled ? 1 : 0);
     }
-    
+
+    private boolean isAdvancedSettingsEnabled() {
+        return Settings.System.getInt(getContentResolver(), 
+                                      Settings.System.ADVANCED_SETTINGS,
+                                      Settings.System.ADVANCED_SETTINGS_DEFAULT) > 0;
+    }
+
+    private void setAdvancedSettingsEnabled(boolean enabled) {
+        int value = enabled ? 1 : 0;
+        // Change the system setting
+        Settings.Secure.putInt(getContentResolver(), Settings.System.ADVANCED_SETTINGS, value);
+        // TODO: the settings thing should broadcast this for thread safety purposes.
+        Intent intent = new Intent(Intent.ACTION_ADVANCED_SETTINGS_CHANGED);
+        intent.putExtra("state", value);
+        getActivity().sendBroadcast(intent);
+    }
+
     private boolean isNonMarketAppsAllowed() {
         return Settings.Secure.getInt(getContentResolver(), 
                                       Settings.Secure.INSTALL_NON_MARKET_APPS, 0) > 0;
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/DefaultRingtonePreference.java b/src/com/android/settings/DefaultRingtonePreference.java
index 0933d62..0801b1f 100644
--- a/src/com/android/settings/DefaultRingtonePreference.java
+++ b/src/com/android/settings/DefaultRingtonePreference.java
@@ -23,7 +23,6 @@
 import android.net.Uri;
 import android.preference.RingtonePreference;
 import android.util.AttributeSet;
-import android.util.Config;
 import android.util.Log;
 
 public class DefaultRingtonePreference extends RingtonePreference {
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/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java
index 99828ce..2960180 100644
--- a/src/com/android/settings/SettingsLicenseActivity.java
+++ b/src/com/android/settings/SettingsLicenseActivity.java
@@ -21,7 +21,6 @@
 import android.os.Message;
 import android.os.SystemProperties;
 import android.text.TextUtils;
-import android.util.Config;
 import android.util.Log;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -46,7 +45,7 @@
 public class SettingsLicenseActivity extends Activity {
 
     private static final String TAG = "SettingsLicenseActivity";
-    private static final boolean LOGV = false || Config.LOGV;
+    private static final boolean LOGV = false || false;
 
     private static final String DEFAULT_LICENSE_PATH = "/system/etc/NOTICE.html.gz";
     private static final String PROPERTY_LICENSE_PATH = "ro.config.license_path";
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/TestingSettingsBroadcastReceiver.java b/src/com/android/settings/TestingSettingsBroadcastReceiver.java
index c6cd7e1..cea12c5 100644
--- a/src/com/android/settings/TestingSettingsBroadcastReceiver.java
+++ b/src/com/android/settings/TestingSettingsBroadcastReceiver.java
@@ -6,7 +6,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.BroadcastReceiver;
-import android.util.Config;
 import android.util.Log;
 import android.view.KeyEvent;
 
diff --git a/src/com/android/settings/accounts/AccountPreferenceBase.java b/src/com/android/settings/accounts/AccountPreferenceBase.java
index a84bece..a0d6a7f 100644
--- a/src/com/android/settings/accounts/AccountPreferenceBase.java
+++ b/src/com/android/settings/accounts/AccountPreferenceBase.java
@@ -32,6 +32,7 @@
 import android.content.SyncAdapterType;
 import android.content.SyncStatusObserver;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
@@ -113,7 +114,7 @@
                     mAccountTypeToAuthorities.put(sa.accountType, authorities);
                 }
                 if (Log.isLoggable(TAG, Log.VERBOSE)) {
-                    Log.d(TAG, "added authority " + sa.authority + " to accountType " 
+                    Log.d(TAG, "added authority " + sa.authority + " to accountType "
                             + sa.accountType);
                 }
                 authorities.add(sa.authority);
@@ -136,7 +137,10 @@
                 icon = authContext.getResources().getDrawable(desc.iconId);
             } catch (PackageManager.NameNotFoundException e) {
                 // TODO: place holder icon for missing account icons?
-                Log.w(TAG, "No icon for account type " + accountType);
+                Log.w(TAG, "No icon name for account type " + accountType);
+            } catch (Resources.NotFoundException e) {
+                // TODO: place holder icon for missing account icons?
+                Log.w(TAG, "No icon resource for account type " + accountType);
             }
         }
         return icon;
@@ -155,7 +159,9 @@
                 Context authContext = getActivity().createPackageContext(desc.packageName, 0);
                 label = authContext.getResources().getText(desc.labelId);
             } catch (PackageManager.NameNotFoundException e) {
-                Log.w(TAG, "No label for account type " + ", type " + accountType);
+                Log.w(TAG, "No label name for account type " + accountType);
+            } catch (Resources.NotFoundException e) {
+                Log.w(TAG, "No label icon for account type " + accountType);
             }
         }
         return label;
@@ -179,6 +185,8 @@
                 }
             } catch (PackageManager.NameNotFoundException e) {
                 Log.w(TAG, "Couldn't load preferences.xml file from " + desc.packageName);
+            } catch (Resources.NotFoundException e) {
+                Log.w(TAG, "Couldn't load preferences.xml file from " + desc.packageName);
             }
         }
         return prefs;
diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java
index 9576dee..631fe47 100644
--- a/src/com/android/settings/accounts/ChooseAccountActivity.java
+++ b/src/com/android/settings/accounts/ChooseAccountActivity.java
@@ -23,6 +23,7 @@
 import android.content.Intent;
 import android.content.SyncAdapterType;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.preference.Preference;
@@ -199,7 +200,10 @@
                 icon = authContext.getResources().getDrawable(desc.iconId);
             } catch (PackageManager.NameNotFoundException e) {
                 // TODO: place holder icon for missing account icons?
-                Log.w(TAG, "No icon for account type " + accountType);
+                Log.w(TAG, "No icon name for account type " + accountType);
+            } catch (Resources.NotFoundException e) {
+                // TODO: place holder icon for missing account icons?
+                Log.w(TAG, "No icon resource for account type " + accountType);
             }
         }
         return icon;
@@ -218,7 +222,9 @@
                 Context authContext = createPackageContext(desc.packageName, 0);
                 label = authContext.getResources().getText(desc.labelId);
             } catch (PackageManager.NameNotFoundException e) {
-                Log.w(TAG, "No label for account type " + ", type " + accountType);
+                Log.w(TAG, "No label name for account type " + accountType);
+            } catch (Resources.NotFoundException e) {
+                Log.w(TAG, "No label resource for account type " + accountType);
             }
         }
         return label;
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();