Gitiles
Code Review Sign In
gerrit.omnirom.org / android_packages_apps_Settings / a2ebc3f49918c7af20a06a550943733f66837623^2..a2ebc3f49918c7af20a06a550943733f66837623 / .
commita2ebc3f49918c7af20a06a550943733f66837623[log] [tgz]
authorPaul Lawrence <paullawrence@google.com>Wed May 14 14:23:30 2014 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>Wed May 14 14:23:31 2014 +0000
treeb0e0a1e588b7d765d4b4562cdcfffa86484db05d
parent5659e6deed6f171f21038b574f15b5f80204aa62 [diff]
parent3873a193d51f50a859aef2d350b6c834d42aecba [diff]
Merge "Make pattern visible at decryption time"
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index a628ad1..4172ae1 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml

@@ -366,7 +366,7 @@
     <item msgid="4589278788192525675">"Schwarz auf Weiß"</item>
     <item msgid="1309255027325660115">"Gelb auf Schwarz"</item>
     <item msgid="2985943780939258562">"Gelb auf Blau"</item>
-    <item msgid="7520438652121629055">"Benutzerdefiniert"</item>
+    <item msgid="7520438652121629055">"Personalisiert"</item>
   </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>

diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index dd14c74..973b3f5 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml

@@ -1887,8 +1887,8 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Հետնաշերտի գործընթացի սահմանաչափ"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Ցույց տալ բոլոր ANR-երը"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Ցուցադրել այն ծրագիրը, որը չի արձագանքում երկխոսությունը հետնաշերտի ծրագրերի համար"</string>
-    <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Կրճատել WebView-ի թրաֆիկը"</string>
-    <string name="webview_data_reduction_proxy_summary" msgid="4743441353857190066">"Կրճատել WebView-ի թրաֆիկը՝ Google-ի սեղմման սերվերներին միանալու միջոցով (փորձնական)"</string>
+    <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Կրճատել WebView-ի հոսքը"</string>
+    <string name="webview_data_reduction_proxy_summary" msgid="4743441353857190066">"Կրճատել WebView-ի հոսքը՝ Google-ի սեղմման սերվերներին միանալու միջոցով (փորձնական)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Տվյալների օգտագործում"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Տվյալների օգտագործման աշխատաշրջան"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Տվյալների ռոումինգ"</string>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 4acb11a..dcc8b8b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -1887,7 +1887,7 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Batas proses latar blkg"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Tampilkan semua ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Tmplkn dialog Apl Tidak Merespons utk apl ltr blkg"</string>
-    <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Kurangi Penggunaan Jaringan WebView"</string>
+    <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Kurangi Pemakaian WebView"</string>
     <string name="webview_data_reduction_proxy_summary" msgid="4743441353857190066">"Mengurangi penggunaan jaringan dengan menggunakan proxy pada sambungan WebView melalui server kompresi Google (Eksperimental)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Daur penggunaan data"</string>

diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 3d1513f..c63f786 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml

@@ -1887,10 +1887,8 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"ფონური პროცესების ლიმიტი"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"ყველა ANR-ის ჩვენება"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"შეტყობინების ჩვენება, როცა ფონური აპლიკაცია არ პასუხობს"</string>
-    <!-- no translation found for webview_data_reduction_proxy (9184006980398676807) -->
-    <skip />
-    <!-- no translation found for webview_data_reduction_proxy_summary (4743441353857190066) -->
-    <skip />
+    <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView ქსელის გამოყენების შემცირება"</string>
+    <string name="webview_data_reduction_proxy_summary" msgid="4743441353857190066">"ქსელის გამოყენების შემცირება WebView კავშირების Google კომპრესიის სერვერების გავლით პროქსირებით (ექსპერიმენტული)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"მონაცემთა გადაცემის მოხმარება"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"მონაცემების გამოყენების ციკლი"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"ინტერნეტ როუმინგი"</string>

diff --git a/res/values-km-rKH/arrays.xml b/res/values-km-rKH/arrays.xml
index 55e6e63..04334d4 100644
--- a/res/values-km-rKH/arrays.xml
+++ b/res/values-km-rKH/arrays.xml

@@ -129,7 +129,7 @@
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ប៊ូតុង​ចុច"</item>
-    <item msgid="1624323946324499595">"កូដ PIN ពី​ឧបករណ៍"</item>
+    <item msgid="1624323946324499595">"កូដ PIN ពី​ឧបករណ៍​"</item>
     <item msgid="5366790421523328066">"កូដ PIN ពី​ឧបករណ៍​នេះ"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
@@ -147,7 +147,7 @@
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ខ្សោយ"</item>
-    <item msgid="5615082285463430971">"មធ្យម"</item>
+    <item msgid="5615082285463430971">"មធ្យម​"</item>
     <item msgid="3565079809875324621">"ល្អ"</item>
     <item msgid="5702329417707689835">"ល្អ​ណាស់"</item>
   </string-array>
@@ -227,10 +227,10 @@
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"ឧបករណ៍​ផ្ទុក​ខាង​ក្នុង"</item>
     <item msgid="3738430123799803530">"កាត​អេសឌី​​ដែល​អាច​ដក​បាន"</item>
-    <item msgid="4498124044785815005">"ឲ្យ​ប្រព័ន្ធ​សម្រេចចិត្ត"</item>
+    <item msgid="4498124044785815005">"ឲ្យ​ប្រព័ន្ធ​សម្រេចចិត្ត​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​"</item>
   </string-array>
   <string-array name="app_ops_categories">
-    <item msgid="6358963769537892925">"ទី​តាំង"</item>
+    <item msgid="6358963769537892925">"ទី​តាំង​"</item>
     <item msgid="255608127647030286">"ផ្ទាល់ខ្លួន"</item>
     <item msgid="4588829735729884491">"ការ​ផ្ញើ​សារ"</item>
     <item msgid="886742181977884584">"មេឌៀ"</item>
@@ -271,7 +271,7 @@
     <item msgid="5124443975763747838">"ប៊ូតុង​មេឌៀ"</item>
     <item msgid="4547883971364273343">"ការ​ផ្ដោត​សំឡេង"</item>
     <item msgid="2603878814882344450">"កម្រិត​សំឡេង​មេ"</item>
-    <item msgid="7136963238377062018">"កម្រិត​សំឡេង"</item>
+    <item msgid="7136963238377062018">"កម្រិត​សំឡេង​​"</item>
     <item msgid="4270236897655923007">"កម្រិត​សំឡេង​រោទ៍"</item>
     <item msgid="6325739889222559394">"កម្រិត​សំឡេង​មេឌៀ"</item>
     <item msgid="5762123934816216821">"កម្រិត​សំឡេង​រោទ៍"</item>
@@ -282,9 +282,9 @@
     <item msgid="5753382310468855812">"​ពិនិត្យ​ទីតាំង​ថាមពល​​ខ្ពស់"</item>
   </string-array>
   <string-array name="app_ops_labels">
-    <item msgid="6602854600289714121">"ទី​តាំង"</item>
-    <item msgid="8677040780775113033">"ទី​តាំង"</item>
-    <item msgid="1660743989948992916">"ទី​តាំង"</item>
+    <item msgid="6602854600289714121">"ទី​តាំង​"</item>
+    <item msgid="8677040780775113033">"ទី​តាំង​"</item>
+    <item msgid="1660743989948992916">"ទី​តាំង​"</item>
     <item msgid="8791172739860195290">"ញ័រ"</item>
     <item msgid="383413555642128046">"អាន​ទំនាក់ទំនង"</item>
     <item msgid="3654594895269697313">"កែ​ទំនាក់ទំនង"</item>
@@ -292,13 +292,13 @@
     <item msgid="6248591205254641116">"កែ​បញ្ជី​ហៅ"</item>
     <item msgid="6093344633066170692">"អាន​ប្រតិទិន"</item>
     <item msgid="1334886368750347692">"កែ​ប្រតិទិន"</item>
-    <item msgid="1638204101698708656">"ទី​តាំង"</item>
+    <item msgid="1638204101698708656">"ទី​តាំង​"</item>
     <item msgid="2154671955760380322">"ប្រកាស​ការ​ជូន​ដំណឹង"</item>
-    <item msgid="4282477730595931828">"ទី​តាំង"</item>
+    <item msgid="4282477730595931828">"ទី​តាំង​"</item>
     <item msgid="4891423912898525905">"ហៅ​ទូរស័ព្ទ"</item>
     <item msgid="2623604824935968113">"អាន​សារ SMS/MMS"</item>
     <item msgid="4420177125221176306">"សរសេរ​សារ SMS/MMS"</item>
-    <item msgid="3986142739951490025">"ទទួល SMS/MMS"</item>
+    <item msgid="3986142739951490025">"ទទួល SMS/MMS​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​"</item>
     <item msgid="3984213795861739778">"ទទួល SMS/MMS"</item>
     <item msgid="3656243523752472788">"ទទួល SMS/MMS"</item>
     <item msgid="8105802370238551510">"ទទួល SMS/MMS"</item>
@@ -323,8 +323,8 @@
     <item msgid="9103719301075748925">"កម្រិត​សំឡេង​ការ​ជូន​ដំណឹង"</item>
     <item msgid="7025966722295861512">"កម្រិត​សំឡេង​ប៊្លូធូស"</item>
     <item msgid="4665183401128289653">"មិន​ដេក"</item>
-    <item msgid="8584357129746649222">"ទី​តាំង"</item>
-    <item msgid="7669257279311110599">"ទី​តាំង"</item>
+    <item msgid="8584357129746649222">"ទី​តាំង​"</item>
+    <item msgid="7669257279311110599">"ទី​តាំង​"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"ខ្លី"</item>
@@ -468,7 +468,7 @@
     <item msgid="6692305604213080515">"កំពុង​​ចាប់ផ្ដើម…"</item>
     <item msgid="8001704909356800092">"កំពុង​ត​ភ្ជាប់​…"</item>
     <item msgid="4039737283841672166">"បាន​តភ្ជាប់"</item>
-    <item msgid="4042143101664725090">"អស់​​ពេល"</item>
+    <item msgid="4042143101664725090">"អស់​​ពេល​"</item>
     <item msgid="7664124146786465092">"មិន​ជោគជ័យ"</item>
   </string-array>
   <string-array name="security_settings_premium_sms_values">
@@ -480,10 +480,10 @@
     <item msgid="7088762389498381203">"ធម្មតា"</item>
     <item msgid="4517779899383204000">"សម្របសម្រួល"</item>
     <item msgid="406385694840950802">"ទាប"</item>
-    <item msgid="4212263919458209842">"សំខាន់"</item>
+    <item msgid="4212263919458209842">"សំខាន់​"</item>
   </string-array>
   <string-array name="inversion_type_entries">
-    <item msgid="9312912686075064">"ស្តង់ដារ"</item>
+    <item msgid="9312912686075064">"ស្តង់ដារ​"</item>
     <item msgid="7316546394967864094">"ពណ៌​លាំ​តែ​ប៉ុណ្ណោះ"</item>
     <item msgid="5385613066929784179">"តម្លៃ​តែ​ប៉ុណ្ណោះ"</item>
   </string-array>

diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 657cf89..626f011 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml

@@ -71,7 +71,7 @@
     <string name="small_font" msgid="2295331917424072635">"តូច"</string>
     <string name="medium_font" msgid="2068475425515133701">"ឧបករណ៍​ផ្ទុក"</string>
     <string name="large_font" msgid="599055175160971446">"ធំ"</string>
-    <string name="font_size_save" msgid="3450855718056759095">"យល់​ព្រម"</string>
+    <string name="font_size_save" msgid="3450855718056759095">"យល់​ព្រម​"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"កាត​អេសឌី"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"ស្ថានភាព​ថ្ម៖"</string>
@@ -196,7 +196,7 @@
     <string name="proxy_hostname_label" msgid="8490171412999373362">"ឈ្មោះ​ម៉ាស៊ីន​ប្រូកស៊ី"</string>
     <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"ប្រយ័ត្ន"</string>
-    <string name="proxy_error_dismiss" msgid="4993171795485460060">"យល់​ព្រម"</string>
+    <string name="proxy_error_dismiss" msgid="4993171795485460060">"យល់​ព្រម​"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"ឈ្មោះ​ម៉ាស៊ីន​ដែល​អ្នក​បាន​បញ្ចូល​មិន​ត្រឹមត្រូវ។"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"បញ្ជី​ដកចេញ​ដែល​អ្នក​បាន​បញ្ចូល​មិន​មាន​ទ្រង់ទ្រាយ​ត្រឹមត្រូវ។ សូម​បញ្ចូល​បញ្ជី​ដែន​​​ដ​ក​ចេញ​បំបែក​ដោយ​សញ្ញា​ក្បៀស។"</string>
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"អ្នក​ត្រូវ​តែ​បំពេញ​វាល​ច្រក។"</string>
@@ -260,7 +260,7 @@
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី​បាន​ភ្ជាប់​បាន​តែ​អាន"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"កាត​អេសឌី​​បាន​ភ្ជាប់​បាន​តែ​អាន"</string>
     <string name="skip_label" msgid="47510779345218297">"រំលង"</string>
-    <string name="next_label" msgid="4693520878012668114">"បន្ទាប់"</string>
+    <string name="next_label" msgid="4693520878012668114">"បន្ទាប់​"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"ភាសា"</string>
     <string name="activity_picker_label" msgid="6295660302548177109">"ជ្រើស​សកម្មភាព"</string>
     <string name="device_info_label" msgid="6551553813651711205">"ព័ត៌មាន​ឧបករណ៍"</string>
@@ -271,7 +271,7 @@
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"ឧបករណ៍​ផ្ទុក​​យូអេសប៊ី"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"កាត​អេសឌី"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"ការ​កំណត់​ប្រូកស៊ី"</string>
-    <string name="cancel" msgid="6859253417269739139">"បោះ​បង់"</string>
+    <string name="cancel" msgid="6859253417269739139">"បោះ​បង់​"</string>
     <string name="settings_label" msgid="1626402585530130914">"ការ​កំណត់"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"ការ​កំណត់"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"កំណត់​ផ្លូវកាត់"</string>
@@ -300,9 +300,9 @@
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"ប្រើ​តំបន់​ពេលវេលា​បាន​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"ប្រើ​តំបន់​ពេលវេលា​បាន​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"ប្រើ​ទ្រង់ទ្រាយ ២៤ ម៉ោង"</string>
-    <string name="date_time_set_time" msgid="5716856602742530696">"កំណត់​ម៉ោង"</string>
+    <string name="date_time_set_time" msgid="5716856602742530696">"កំណត់​ម៉ោង​"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"ជ្រើស​តំបន់​ពេលវេលា"</string>
-    <string name="date_time_set_date" msgid="7021491668550232105">"កំណត់​កាល​បរិច្ឆេទ"</string>
+    <string name="date_time_set_date" msgid="7021491668550232105">"កំណត់​កាល​បរិច្ឆេទ​"</string>
     <string name="date_time_date_format" msgid="6951498879879281102">"ជ្រើស​ទ្រង់ទ្រាយ​កាល​បរិច្ឆេទ"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"តម្រៀប​តាម​អក្សរក្រម"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"តម្រៀប​តាម​តំបន់​ពេល​វេលា"</string>
@@ -324,7 +324,7 @@
     <string name="user_info_settings_title" msgid="1195015434996724736">"ព័ត៌មាន​អ្នកប្រើ"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"បង្ហាញ​ព័ត៌មាន​​ប្រវត្តិរូប​លើ​អេក្រង់ចាក់សោ"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"ព័ត៌មាន​ប្រវត្តិរូប"</string>
-    <string name="location_settings_title" msgid="1369675479310751735">"ទី​តាំង"</string>
+    <string name="location_settings_title" msgid="1369675479310751735">"ទី​តាំង​"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"សុវត្ថិភាព"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"កំណត់​ទីតាំង​របស់​ខ្ញុំ ដោះ​សោ​អេក្រង់ ចាក់​សោ​ស៊ីម​កាត ចាក់​សោ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"កំណត់​ទីតាំង​ខ្ញុំ, ការ​ដោះ​សោ​អេក្រង់, សោ​ឧបករណ៍​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
@@ -332,8 +332,8 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ការ​ដាក់​លេខ​កូដ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ដាក់​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ដាក់​លេខ​កូដ​ទូរស័ព្ទ"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"ទាមទារ​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់ ដើម្បី​ដោះ​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ​​របស់​អ្នក​រាល់​ពេល​​បើក"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"ទាមទារ​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់ ដើម្បី​ដោះ​លេខ​កូដ​ទូរស័ព្ទ​របស់​អ្នក​រាល់​ពេល​​បើក"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"ទាមទារ​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់ ដើម្បី​ដោះ​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ​​របស់​អ្នក​រាល់​ពេល​​បើក​"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"ទាមទារ​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់ ដើម្បី​ដោះ​លេខ​កូដ​ទូរស័ព្ទ​របស់​អ្នក​រាល់​ពេល​​បើក​"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"បាន​ដាក់លេខ​កូដ"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"អ្នក​អាច​ដាក់​លេខ​កូដ​គណនី ការ​កំណត់ កម្មវិធី និង​ទិន្នន័យ​បាន​ទាញ​យក មេឌៀ ​និង​​ឯកសារ​ផ្សេងៗ​របស់​អ្នក។ ពេល​អ្នក​ដាក់​លេខ​កូដ​​កុំព្យូទ័រ​បន្ទះ​​របស់​អ្នក អ្នក​ត្រូវ​តែ​បញ្ចូល​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់​ដើម្បី​ដោះ​លេខ​កូដ​របស់​អ្នក​​រាល់​ពេល​ចាប់ផ្ដើម​៖​ អ្នក​មិន​អាច​ដោះ​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ​​​របស់​អ្នក​បាន​​ទេ លើកលែង​តែ​អនុវត្ត​ការ​កំណត់​ទិន្នន័យ​ដូច​ចេញ​ពី​រោងចក្រ ដោយ​លុប​ទិន្នន័យ​របស់​អ្នក​ទាំងអស់។\n\nការ​​ដាក់លេខ​កូដ​ចំណាយ​ពេល​​មួយ​ម៉ោង។ អ្នក​ត្រូវ​បញ្ចូល​ថ្ម​ និង​ដោត​ជាប់​រហូត​ដល់​ពេល​ការ​ដាក់​លេខ​កូដ​បាន​បញ្ចប់។ បើ​អ្នក​ផ្អាក​ដំណើរការ​ដាក់​លេខ​កូដ​ អ្នក​នឹង​បាត់បង់​ទិន្នន័យ​មួយ​ចំនួន ឬ​ទាំង​អស់​របស់​អ្នក។"</string>
     <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"អ្នក​អាច​ដាក់​លេខ​កូដ​​គណនី ការ​កំណត់ កម្មវិធី និង​ទិន្នន័យ​បាន​ទាញ​យក មេឌៀ និង​​ឯកសារ​ផ្សេងៗ​របស់​អ្នក។ ពេល​អ្នក​ដាក់​លេខ​កូដ​ទូរស័ព្ទ​របស់​អ្នក អ្នក​ត្រូវ​តែ​បញ្ចូល​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់​ដើម្បី​ដោះ​លេខ​កូដ​របស់​អ្នក​​រាល់​ពេល​ចាប់ផ្ដើម​៖ អ្នក​មិន​អាច​ដោះ​លេខ​កូដ​ទូរស័ព្ទ​របស់​អ្នក​បាន​​ទេ លើកលែង​តែ​អនុវត្ត​ការ​កំណត់​ទិន្នន័យ​ដូច​ចេញ​ពី​រោងចក្រ ដោយ​លុប​ទិន្នន័យ​របស់​អ្នក​ទាំងអស់។\n\nការ​​ដាក់លេខ​កូដ​ចំណាយ​ពេល​​មួយ​ម៉ោង។ អ្នក​ត្រូវ​បញ្ចូល​ថ្ម​ និង​ដោត​ជាប់​រហូត​ដល់​ពេល​ការ​ដាក់​លេខ​កូដ​បាន​បញ្ចប់។ បើ​អ្នក​ផ្អាក​ដំណើរការ​ដាក់​លេខ​កូដ​ អ្នក​នឹង​បាត់បង់​ទិន្នន័យ​មួយ​ចំនួន ឬ​ទាំង​អស់​របស់​អ្នក។"</string>
@@ -372,7 +372,7 @@
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"សុវត្ថិភាព​មធ្យម"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"កូដ PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"សុវត្ថិភាព​ពី​មធ្យម​ទៅ​ខ្ពស់"</string>
-    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ពាក្យសម្ងាត់"</string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ពាក្យសម្ងាត់​"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"សុវត្ថិភាព​ខ្ពស់"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"បាន​បិទ​ដោយ​​អ្នក​គ្រប់គ្រង ការ​ដាក់​លេខ​កូដ​គោលនយោបាយ ឬ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"គ្មាន"</string>
@@ -380,7 +380,7 @@
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"ដោះ​សោ​តាម​​ទម្រង់​មុខ"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"លំនាំ"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"កូដ PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"ពាក្យសម្ងាត់"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"ពាក្យសម្ងាត់​"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"បិទ​ការ​ចាក់​សោ​អេក្រង់"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"លុប​​លំនាំ​ដោះ​សោ"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"លុប​កូដ​ PIN ដោះ​សោ"</string>
@@ -389,7 +389,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ប្ដូរ​កូដ​ PIN ដោះ​សោ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ប្ដូរ​ពាក្យសម្ងាត់​ដោះ​សោ"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"ពាក្យ​សម្ងាត់​ត្រូវ​មាន​យ៉ាង​ហោច​ណាស់ %d តួអក្សរ"</string>
-    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"កូដ PIN ត្រូវ​តែ​មាន​​យ៉ាង​ហោច​ណាស់ %d តួ"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"កូដ PIN ត្រូវ​តែ​មាន​​យ៉ាង​ហោច​ណាស់ %d តួ​"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"ប៉ះ បន្ត​ពេល​រួចរាល់"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"បន្ត"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​តិច​ជាង <xliff:g id="NUMBER">%d</xliff:g> តួអក្សរ។"</string>
@@ -425,10 +425,10 @@
     <item quantity="other" msgid="3952508584649046404">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​មាន​យ៉ាង​ហោច​ណាស់​តួអក្សរ​មិន​មែ​ន​ជា​អក្សរ %d ។"</item>
   </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"អ្នក​គ្រប់គ្រង​ឧបករណ៍​មិន​អនុញ្ញាត​ឲ្យ​ប្រើ​ពាក្យ​សម្ងាត់​បច្ចុប្បន្ន​ទេ។"</string>
-    <string name="lockpassword_ok_label" msgid="313822574062553672">"យល់​ព្រម"</string>
-    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"បោះ​បង់"</string>
-    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"បោះ​បង់"</string>
-    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"បន្ទាប់"</string>
+    <string name="lockpassword_ok_label" msgid="313822574062553672">"យល់​ព្រម​"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"បោះ​បង់​"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"បោះ​បង់​"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"បន្ទាប់​"</string>
     <string name="lock_setup" msgid="3355847066343753943">"ការ​រៀបចំ​បាន​បញ្ចប់។"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"ការ​គ្រប់គ្រង​ឧបករណ៍"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"អ្នក​គ្រប់គ្រង​ឧបករណ៍"</string>
@@ -469,7 +469,7 @@
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"ពី៖ &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ផ្គូផ្គង​ជា​មួយ​ឧបករណ៍​នេះ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"ដើម្បី​ផ្គូផ្គង​ជា​មួយ៖ <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>វាយ​បញ្ចូល៖ <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> បន្ទាប់​មក​ចុច​ Return ឬ Enter ។"</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"ផ្គូផ្គង"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"បោះ​បង់"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"បោះ​បង់​"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"មិន​អាច​ផ្គូផ្គង​ជា​មួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ។"</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"មិន​អាច​ផ្គូផ្គង​ជា​មួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ព្រោះ​​​កូដ PIN ឬ​លេខ​កូដ​មិន​ត្រឹមត្រូវ។"</string>
@@ -566,7 +566,7 @@
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ពេល​ជិះ​យន្ត"</string>
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"មិន​អាច​វិភាគ​រក​បណ្ដាញ"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"ការ​ជូន​ដំណឹង​បណ្ដាញ"</string>
-    <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"ជូន​ដំណឹង​ខ្ញុំ ពេល​​មាន​បណ្ដាញ"</string>
+    <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"ជូន​ដំណឹង​ខ្ញុំ ពេល​​មាន​បណ្ដាញ​​"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ជៀសវាង​ការ​តភ្ជាប់​ដែល​ខ្សោយ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"កុំ​ប្រើ​បណ្ដាញ​វ៉ាយហ្វាយ លុះ​ត្រា​វា​មាន​ការ​តភ្ជាប់​អ៊ីនធឺណិត​ល្អ"</string>
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"វិភាគ​រក​​គ្រប់ពេល"</string>
@@ -624,7 +624,7 @@
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"វិញ្ញាបនបត្រ​អ្នក​ប្រើ"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"អត្តសញ្ញាណ"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"អត្តសញ្ញាណ​អនាមិក"</string>
-    <string name="wifi_password" msgid="5948219759936151048">"ពាក្យសម្ងាត់"</string>
+    <string name="wifi_password" msgid="5948219759936151048">"ពាក្យសម្ងាត់​"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"បង្ហាញ​ពាក្យ​សម្ងាត់"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"ការ​កំណត់ IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(មិន​ផ្លាស់ប្ដូរ)"</string>
@@ -649,7 +649,7 @@
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"បាន​បរាជ័យ​ក្នុង​បំភ្លេច​បណ្ដាញ"</string>
     <string name="wifi_save" msgid="3331121567988522826">"រក្សាទុក"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"បាន​បរាជ័យ​ក្នុង​ការ​រក្សាទុក​បណ្ដាញ"</string>
-    <string name="wifi_cancel" msgid="6763568902542968964">"បោះ​បង់"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"បោះ​បង់​"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"រំលង"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"កុំ​រំលង"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ការ​ព្រមាន៖ អ្នក​អាច​​ត្រូវ​កាត់​លុយ​ថ្លៃ​សេវាកម្ម​ទិន្នន័យ​។\n\nការ​រៀបចំ​កុំព្យូទ័រ​បន្ទះ​អាច​ទាមទារ​សកម្មភាព​បណ្ដាញ​ដែល​សំខាន់។"</string>
@@ -666,7 +666,7 @@
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"អាសយដ្ឋាន IP"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"ការ​កំណត់ IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"រក្សាទុក"</string>
-    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"បោះ​បង់"</string>
+    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"បោះ​បង់​"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"បញ្ចូល​អាសយដ្ឋាន IP ដែល​ត្រឹមត្រូវ។"</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"បញ្ចូល​អាសយដ្ឋាន​ច្រកចេញ​ចូល​ដែល​ត្រឹមត្រូវ"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"បញ្ចូល​អាសយដ្ឋាន DNS ដែល​ត្រឹមត្រូវ។"</string>
@@ -736,11 +736,11 @@
     <string name="dock_settings" msgid="1820107306693002541">"ភ្ជាប់"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"កំណត់​ការ​ភ្ជាប់"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"សំឡេង"</string>
-    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"កំណត់​សម្រាប់​​ការ​ភ្ជាប់​ផ្ទៃតុ"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"កំណត់​សម្រាប់​​ការ​ភ្ជាប់​ផ្ទៃតុ​"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"កំណត់​សម្រាប់​ភ្ជាប់រថយន្ត"</string>
     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"មិន​បាន​ភ្ជាប់​កុំព្យូទ័រ​បន្ទះ"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"មិន​បាន​ភ្ជាប់ទូរស័ព្ទ"</string>
-    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"កំណត់​សម្រាប់​ការ​ភ្ជាប់"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"កំណត់​សម្រាប់​ការ​ភ្ជាប់​"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"រក​មិន​ឃើញ​ការ​ភ្ជាប់"</string>
     <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"អ្នក​ត្រូវ​ភ្ជាប់​កុំព្យូទ័រ​បន្ទះ មុន​នឹង​រៀបចំ​​​សំឡេង​​ភ្ជាប់។"</string>
     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"អ្នក​ត្រូវ​តែ​ភ្ជាប់​ទូរស័ព្ទ មុន​ពេល​កំណត់​សំឡេង​ភ្ជាប់។"</string>
@@ -798,8 +798,8 @@
     <string name="sim_change_failed" msgid="304964924772218382">"មិន​អាច​ប្ដូរ​កូដ PIN ។\nប្រហែលជា​កូដ PIN មិន​ត្រឹមត្រូវ។"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"បាន​ប្ដូរ​​​កូដ PIN ស៊ីម​កាត់​ដោយ​ជោគជ័យ"</string>
     <string name="sim_lock_failed" msgid="5651596916127873626">"មិន​អាច​ប្ដូរ​ស្ថានភាព​ការ​ចាក់​សោ​ស៊ីម​កាត។\nប្រហែល​ជា​កូដ​ PIN មិន​ត្រឹមត្រូវ។"</string>
-    <string name="sim_enter_ok" msgid="6475946836899218919">"យល់​ព្រម"</string>
-    <string name="sim_enter_cancel" msgid="6240422158517208036">"បោះ​បង់"</string>
+    <string name="sim_enter_ok" msgid="6475946836899218919">"យល់​ព្រម​"</string>
+    <string name="sim_enter_cancel" msgid="6240422158517208036">"បោះ​បង់​"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"លេខ​កូដ PIN ស៊ីម​មិន​ត្រឹមត្រូវ អ្នក​ត្រូវ​​ទាក់ទង​ក្រុមហ៊ុន​បញ្ជូន​របស់​អ្នក​ឥឡូវ​នេះ​ដើម្បី​ដោះ​សោ​ឧបករណ៍​របស់​អ្នក។"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"លេខ​កូដ PIN ស៊ីម​មិន​ត្រឹមត្រូវ, អ្នក​​មាន​ <xliff:g id="NUMBER">%d</xliff:g> ការ​ព្យាយាម​ដែល​នៅ​សល់​​​​មុន​ពេល​ដែល​អ្នក​ត្រូវ​​ទាក់ទង​​ក្រុមហ៊ុន​បញ្ជូន​​ដើម្បី​ដោះ​សោ​ឧបករណ៍​របស់​អ្នក។"</item>
@@ -887,7 +887,7 @@
     <string name="dlg_error_unmount_text" product="default" msgid="3073562815631781894">"មិន​អាច​ផ្ដាច់​​កាត​អេសឌី។ ព្យាយាម​ម្ដង​ទៀត​ពេល​ក្រោយ។"</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី​នឹង​​​ត្រូវ​បាន​ផ្ដាច់។"</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"កាត​អេសឌី​នឹង​ត្រូវ​បាន​ផ្ដាច់។"</string>
-    <string name="sd_ejecting_title" msgid="8824572198034365468">"ផ្ដាច់"</string>
+    <string name="sd_ejecting_title" msgid="8824572198034365468">"ផ្ដាច់​"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"ការ​ផ្ដាច់​​កំពុង​ដំណើរការ"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"អស់​ទំហំផ្ទុក"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"មុខងារ​ប្រព័ន្ធ​មួយ​ចំនួន​ដូច​ជា ការ​ធ្វើ​សម​កាល​កម្ម​អាច​ដំណើរការ​មិន​ត្រឹមត្រូវ។ ព្យាយាម​បង្កើត​ទំហំ ដោយ​លុប​ ឬ​​ដោះ​ខ្ទាស់​ធាតុ​មួយ​ចំនួន​ដូច​ជា កម្មវិធី ឬ​មាតិកា​មេឌៀ។"</string>
@@ -909,8 +909,8 @@
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
     <string name="apn_http_proxy" msgid="1826885957243696354">"ប្រូកស៊ី"</string>
     <string name="apn_http_port" msgid="3763259523984976226">"ច្រក"</string>
-    <string name="apn_user" msgid="455637547356117761">"ឈ្មោះ​អ្នក​ប្រើ"</string>
-    <string name="apn_password" msgid="5412301994998250968">"ពាក្យសម្ងាត់"</string>
+    <string name="apn_user" msgid="455637547356117761">"ឈ្មោះ​អ្នក​ប្រើ​"</string>
+    <string name="apn_password" msgid="5412301994998250968">"ពាក្យសម្ងាត់​"</string>
     <string name="apn_server" msgid="2436185314756372858">"ម៉ាស៊ីន​មេ"</string>
     <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
     <string name="apn_mms_proxy" msgid="5374082621073999275">"ប្រូកស៊ី MMS"</string>
@@ -1012,7 +1012,7 @@
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"ប្រើ <xliff:g id="NEW_APP">%1$s</xliff:g> ជំនួស​ឲ្យ <xliff:g id="CURRENT_APP">%2$s</xliff:g> ជា​កម្មវិធី​សារ SMS របស់​អ្នក?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"ប្រើ <xliff:g id="NEW_APP">%s</xliff:g> ជា​កម្មវិធី​សារ SMS របស់​អ្នក?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"មិន​ស្គាល់​​ប្រតិបត្តិ​ករ​​ស៊ីមកាត"</string>
-    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s គ្មាន​តំបន់​បណ្ដាញ​ដែល​ផ្ដល់​បាន​​ស្គាល់"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s គ្មាន​តំបន់​បណ្ដាញ​ដែល​ផ្ដល់​បាន​​ស្គាល់​"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"សូម​បញ្ចូល​ស៊ីមកាត និង​ចាប់ផ្ដើម​ឡើង​វិញ"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"សូម​ភ្ជាប់​អ៊ីនធឺណិត"</string>
     <string name="location_title" msgid="1029961368397484576">"ទីតាំង​ខ្ញុំ"</string>
@@ -1020,7 +1020,7 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ភាព​ត្រឹមត្រូវ​ខ្ពស់"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ការ​សន្សំ​ថ្ម"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"តែ​​ឧបករណ៍​ប៉ុណ្ណោះ"</string>
-    <string name="location_mode_location_off_title" msgid="2829713015012529465">"បិទទីតាំង"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"បិទទីតាំង​"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"សំណើ​ទីតាំង​ថ្មី"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"បច្ចុប្បន្ន​គ្មាន​កម្មវិធី​បាន​ស្នើ​ទីតាំង"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"សេវាកម្ម​ទីតាំង"</string>
@@ -1077,7 +1077,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"ប្ដូរ​​​កូដ​ PIN ដោះ​សោ"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"បញ្ជាក់​លំនាំ​បាន​រក្សាទុក"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"ព្យាយាម​ម្ដង​ទៀត៖"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"គូរ​​លំនាំ​ដោះ​សោ"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"គូរ​​លំនាំ​ដោះ​សោ​"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"ចុច ម៉ឺនុយ​សម្រាប់​ជំនួយ។"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ដក​ម្រាមដៃ​​ពេល​រួចរាល់។"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"ភ្ជាប់​ចំណុច​យ៉ាង​ហោច​ណាស់ <xliff:g id="NUMBER">%d</xliff:g> ។ ព្យាយាម​ម្ដង​ទៀត។"</string>
@@ -1171,8 +1171,8 @@
     <string name="recompute_size" msgid="7722567982831691718">"កំពុង​គណនា​ទំហំ​ឡើងវិញ…"</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"លុប​ទិន្នន័យ​កម្មវិធី?"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"ទិន្នន័យ​របស់​កម្មវិធី​នេះ​ទាំងអស់​នឹង​ត្រូវ​បាន​លុប​ជា​អចិន្ត្រៃយ៍។ រួមមាន ឯកសារ​ទាំងអស់, ការ​កំណត់, គណនី, មូលដ្ឋាន​ទិន្នន័យ ។ល។"</string>
-    <string name="dlg_ok" msgid="2402639055725653590">"យល់​ព្រម"</string>
-    <string name="dlg_cancel" msgid="1674753358972975911">"បោះ​បង់"</string>
+    <string name="dlg_ok" msgid="2402639055725653590">"យល់​ព្រម​"</string>
+    <string name="dlg_cancel" msgid="1674753358972975911">"បោះ​បង់​"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="8333723538280257243">"រក​មិន​ឃើញ​កម្មវិធី​ក្នុង​បញ្ជី​កម្មវិធី​បាន​ដំឡើង។"</string>
     <string name="clear_data_failed" msgid="1907582169616856698">"មិន​អាច​សម្អាត​ទិន្នន័យ​កម្មវិធី។"</string>
@@ -1293,14 +1293,14 @@
     <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"ឃ្លា"</string>
     <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"ជម្រើស​ច្រើន​ទៀត"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"ជម្រើស​តិច"</string>
-    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"យល់​ព្រម"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"យល់​ព្រម​"</string>
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"ពាក្យ"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"ផ្លូវកាត់៖"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"ភាសា៖"</string>
     <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"បញ្ចូល​ពាក្យ"</string>
     <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"ផ្លូវកាត់​ជម្រើស"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"កែ​ពាក្យ"</string>
-    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"កែសម្រួល"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"កែសម្រួល​"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"លុប"</string>
     <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"អ្នក​មិន​មាន​ពាក្យ​ក្នុង​វចនានុក្រម​អ្នក​ប្រើ។ បន្ថែម​ពាក្យ​ដោយ​ប៉ះ​ប៊ូតុង (+) ។"</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"សម្រាប់​ភាសា​ទាំងអស់"</string>
@@ -1316,8 +1316,8 @@
     <string name="quick_launch_shortcut" msgid="5090405067413522300">"ស្វែងរក + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
     <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"សម្អាត"</string>
     <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"ផ្លូវកាត់​របស់​អ្នក​សម្រាប់ <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) នឹង​ត្រូវ​បាន​សម្អាត។"</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"យល់​ព្រម"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"បោះ​បង់"</string>
+    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"យល់​ព្រម​"</string>
+    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"បោះ​បង់​"</string>
     <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"កម្មវិធី"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"ផ្លូវកាត់"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"ការ​បញ្ចូល​អត្ថបទ"</string>
@@ -1431,7 +1431,7 @@
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"បើក"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"បិទ"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"មើល​ជាមុន"</string>
-    <string name="captioning_standard_options_title" msgid="3284211791180335844">"ជម្រើស​ស្តង់​ដារ"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"ជម្រើស​ស្តង់​ដារ​"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"ភាសា"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"ទំហំ​អត្ថបទ"</string>
     <string name="captioning_preset" msgid="8939737196538429044">"រចនាប័ទ្ម​ចំណងជើង"</string>
@@ -1491,8 +1491,8 @@
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"ការ​បោះបង់ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_failed_state_title_template" msgid="1436099128973357969">"កំហុស​​ម៉ាស៊ីន​បោះពុម្ព <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_blocked_state_title_template" msgid="9065391617425962424">"បាន​ទប់ស្កាត់​ម៉ាស៊ីន​បោះពុម្ព <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
-    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"បាន​បង្ហាញ​ប្រ​អប់​ស្វែងរក"</string>
-    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"បាន​លាក់​ប្រអប់​ស្វែងរក"</string>
+    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"បាន​បង្ហាញ​ប្រ​អប់​ស្វែងរក​"</string>
+    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"បាន​លាក់​ប្រអប់​ស្វែងរក​"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"ថ្ម"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"អ្វី​​ដែល​កំពុង​​ប្រើ​ថ្ម"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"មិន​មាន​ទិន្នន័យ​ការ​ប្រើ​ថ្ម"</string>
@@ -1532,7 +1532,7 @@
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"កុំព្យូទ័រ​បន្ទះ​ទំនេរ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ទូរស័ព្ទ​ទំនេរ"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"ផ្សេងៗ"</string>
-    <string name="power_overcounted" msgid="2762354976171358445">"លើស"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"លើស​"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU សរុប"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ផ្ទៃ​ខាង​មុខ CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"មិន​ដេក"</string>
@@ -1546,7 +1546,7 @@
     <string name="usage_type_data_wifi_send" msgid="1847552143597396162">"ផ្ញើ​កញ្ចប់ព័ត៌មានតាមវ៉ាយហ្វាយ"</string>
     <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"​ទទួលកញ្ចប់ព័ត៌មានតាមវ៉ាយហ្វាយ"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"សំឡេង"</string>
-    <string name="usage_type_video" msgid="4295357792078579944">"វីដេអូ"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"វីដេអូ​"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"ពេលវេលា​បើក"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"ពេលវេលា​គ្មាន​សញ្ញា"</string>
     <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"កម្រិត​​ថ្ម​សរុប"</string>
@@ -1569,15 +1569,15 @@
     <string name="battery_desc_wifi" msgid="2375567464707394131">"ថ្មប្រើ​ដោយ​វ៉ាយហ្វាយ"</string>
     <string name="battery_sugg_wifi" msgid="3355461362094706957">"បិទ​វ៉ាយ​ហ្វាយ​​ពេល​មិន​ប្រើ​ ឬ​​​មិន​មាន"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"ថ្ម​បាន​ប្រើ​ដោយ​ប៊្លូធូស"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"បិទ​ប៊្លូធូស​ពេល​អ្នក​មិន​ប្រើ"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"បិទ​ប៊្លូធូស​ពេល​អ្នក​មិន​ប្រើ​"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"ព្យាយាម​តភ្ជាប់​​ទៅ​ឧបករណ៍​ប៊្លូធូស​ផ្សេង"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"ថ្ម​បាន​ប្រើ​ដោយ​កម្មវិធី"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"បញ្ឈប់ ឬ​លុប​កម្មវិធី"</string>
-    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ជ្រើស​របៀប​សន្សំ​ថ្ម"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ជ្រើស​របៀប​សន្សំ​ថ្ម​"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"កម្មវិធី​អាច​ផ្ដល់​ការ​កំណត់​ ដើម្បី​កាត់បន្ថយ​ការ​ប្រើ​ថ្ម"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ថ្ម​បាន​ប្រើ​ដោយ​អ្នក​ប្រើ"</string>
     <string name="battery_desc_unaccounted" msgid="827801520179355764">"មិន​ស្គាល់​ថាមពល​ប្រើប្រាស់"</string>
-    <string name="battery_desc_overcounted" msgid="5481865509489228603">"ការ​ប្រើ​ប្រាស់​ថាមពល​លើស"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"ការ​ប្រើ​ប្រាស់​ថាមពល​លើស​"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> តាំង​ពី​បានដក"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"ពេល​បាន​ដក​ឧបករណ៍​បញ្ចូល​ថ្ម​ចុង​ក្រោយ​សម្រាប់ <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -1586,12 +1586,12 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"ប្រព័ន្ធ​ប្រតិបត្តិការ Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"ស្ថិតិ​​ដំណើរការ"</string>
-    <string name="process_stats_summary" msgid="109387941605607762">"ស្ថិតិ Geeky អំពី​ដំណើរការ"</string>
-    <string name="app_memory_use" msgid="7849258480392171939">"ការ​ប្រើ​​អង្គ​ចងចាំ"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"ស្ថិតិ Geeky អំពី​ដំណើរការ​"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"ការ​ប្រើ​​អង្គ​ចងចាំ​"</string>
     <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> កម្មវិធី​ចប់​នៅ <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"ផ្ទៃ​ខាង​ក្រោយ"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"ផ្ទៃ​ខាង​មុខ"</string>
-    <string name="process_stats_type_cached" msgid="6314925846944806511">"ទុក​ក្នុង​ឃ្លាំង"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"ទុក​ក្នុង​ឃ្លាំង​"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"​អង្គ​ចងចាំ​ឧបករណ៍ <xliff:g id="MEMSTATE">%1$s</xliff:g> បច្ចុប្បន្ន"</string>
     <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"ការ​ប្រើ​អង្គ​ចងចាំ​មធ្យម"</string>
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"ការ​ប្រើ​អង្គ​ចងចាំ​អតិបរមា"</string>
@@ -1607,7 +1607,7 @@
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"ប្រភេទ​ស្ថានភាព"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"ផ្ទៃ​ខាង​ក្រោយ"</string>
     <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"ផ្ទៃ​ខាង​មុខ"</string>
-    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"ទុក​ក្នុង​ឃ្លាំង"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"ទុក​ក្នុង​ឃ្លាំង​"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"ការ​បញ្ចូល &amp; បញ្ចេញ​សំឡេង"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"កំណត់​ការ​បញ្ចូល​​ &amp; បញ្ចេញ​សំឡេង"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ស្វែងរក​តាម​​សំឡេង"</string>
@@ -1677,7 +1677,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"បិទ"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"វ៉ាយហ្វាយ"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"ប៊្លូធូស"</string>
-    <string name="gadget_location" msgid="2974757497945178165">"ទី​តាំង"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"ទី​តាំង​"</string>
     <string name="gadget_sync" msgid="858895763714222152">"ធ្វើ​សម​កាល​កម្ម"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"ពន្លឺ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ស្វ័យប្រវត្តិ"</string>
@@ -1756,13 +1756,13 @@
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"បន្ថែម​បណ្ដាញ"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"ផ្ទុក​បញ្ជី​ឡើងវិញ"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"រំលង"</string>
-    <string name="wifi_setup_next" msgid="3388694784447820477">"បន្ទាប់"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"បន្ទាប់​"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"ថយក្រោយ"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"ព័ត៌មាន​លម្អិត​បណ្ដាញ"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"តភ្ជាប់"</string>
     <string name="wifi_setup_forget" msgid="2562847595567347526">"ភ្លេច"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"រក្សាទុក"</string>
-    <string name="wifi_setup_cancel" msgid="3185216020264410239">"បោះ​បង់"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"បោះ​បង់​"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"កំពុង​វិភាគ​រក​បណ្ដាញ…"</string>
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"ប៉ះ​បណ្ដាញ ដើម្បី​តភ្ជាប់​វា"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"តភ្ជាប់​ទៅ​បណ្ដាញ​មាន​ស្រាប់"</string>
@@ -1972,13 +1972,13 @@
     <string name="vpn_search_domains" msgid="5391995501541199624">"ដែន​ស្វែងរក DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"ម៉ាស៊ីន​មេ DNS (ឧ. 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"បញ្ជូន​ផ្លូវ​បន្ត (ឧ. 10.0.0.0/8)"</string>
-    <string name="vpn_username" msgid="1863901629860867849">"ឈ្មោះ​អ្នក​ប្រើ"</string>
-    <string name="vpn_password" msgid="6756043647233596772">"ពាក្យសម្ងាត់"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"ឈ្មោះ​អ្នក​ប្រើ​"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"ពាក្យសម្ងាត់​"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"រក្សាទុក​ព័ត៌មាន​គណនី"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(មិន​បាន​ប្រើ)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(កុំ​ផ្ទៀងផ្ទាត់​ម៉ាស៊ីន​មេ)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(បាន​ទទួល​ពី​ម៉ាស៊ីន​មេ)"</string>
-    <string name="vpn_cancel" msgid="1979937976123659332">"បោះ​បង់"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"បោះ​បង់​"</string>
     <string name="vpn_save" msgid="4233484051644764510">"រក្សាទុក"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"តភ្ជាប់"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"កែ​ប្រវត្តិរូប VPN"</string>
@@ -2006,7 +2006,7 @@
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"បញ្ចូល​ពាក្យ​សម្ងាត់​ថ្មី​សម្រាប់​ការ​បម្រុងទុក​ពេញលេញ​នៅ​ទី​នេះ"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"បញ្ចូល​ពាក្យ​សម្ងាត់​បម្រុង​ទុក​ពេញលេញ​ថ្មី​នៅ​ទី​នេះ​ម្ដង​ទៀត"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"កំណត់​ពាក្យ​សម្ងាត់​បម្រុងទុក"</string>
-    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"បោះ​បង់"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"បោះ​បង់​"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"បច្ចុប្បន្នភាព​ប្រព័ន្ធ​បន្ថែម"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"បិទ"</string>
@@ -2100,10 +2100,10 @@
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"ឲ្យ​ប្ដូរ​ទិន្នន័យ​ពេល​កុំព្យូទ័រ​បន្ទះ​ប៉ះ​ឧបករណ៍​ផ្សេង"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"ឲ្យ​ប្ដូរ​ទិន្នន័យ​ពេល​ទូរស័ព្ទ​ប៉ះ​ឧបករណ៍​ផ្សេង"</string>
-    <string name="restriction_location_enable_title" msgid="5020268888245775164">"ទី​តាំង"</string>
+    <string name="restriction_location_enable_title" msgid="5020268888245775164">"ទី​តាំង​"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"ឲ្យ​កម្មវិធី​ប្រើ​ព័ត៌មាន​ទីតាំង​របស់​អ្នក"</string>
     <string name="wizard_back" msgid="5567007959434765743">"ថយក្រោយ"</string>
-    <string name="wizard_next" msgid="3606212602795100640">"បន្ទាប់"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"បន្ទាប់​"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"បញ្ចប់"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"ថតរូប"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"ជ្រើស​រូបថត​ពី​វិចិត្រសាល"</string>

diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 64a904b..c23156b 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml

@@ -373,7 +373,7 @@
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ຄວາມປອດໄພລະດັບປານກາງຫາສູງ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ລະຫັດຜ່ານ"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ຄວາມ​ປອດ​ໄພ​ສູງ"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ຄວາມ​ປອດ​ໄພ​ສູງ​"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"ຖືກປິດການນຳໃຊ້ໂດຍຜູ່ເບິ່ງແຍງລະບົບ, ນະໂຍບາຍການເຂົ້າລະຫັດ ຫຼືບ່ອນເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ບໍ່ໃຊ້"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"ເລື່ອນ"</string>
@@ -641,7 +641,7 @@
     <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"​ກະ​ລຸ​ນາ​ໃສ່​ລະ​ຫັດ​ຜ່ານ​ເຄືອ​ຂ່າຍ​ຂອງ​ທ່ານ."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"ບໍ່ໃຊ້"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ເພື່ອປັບປຸງຄວາມຖືກຕ້ອງຂອງສະຖານທີ່ ແລະເພື່ອຈຸດປະສົງອື່ນໆ, <xliff:g id="APP_NAME">%1$s</xliff:g> ຕ້ອງການເປີດນຳໃຊ້ການສະແກນເຄືອຂ່າຍ ເຖິງແມ່ນວ່າ Wi-Fi ຈະປິດກໍຕາມ.\n\nອະນຸຍາດການດຳເນີນການນີ້ ໃຫ້ກັບທຸກແອັບຯທີ່ຕ້ອງການສະແກນບໍ່?"</string>
-    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ອະ​ນຸ​ຍາດ"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ອະ​ນຸ​ຍາດ​"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"ປະ​ຕິ​ເສດ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"ເຊື່ອມຕໍ່"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ລົ້ມເຫລວໃນການເຊື່ອມຕໍ່ເຄືອຂ່າຍ"</string>
@@ -1485,7 +1485,7 @@
     <string name="print_print_jobs" msgid="3582094777756968793">"ວຽກ​ພິມ"</string>
     <string name="print_print_job" msgid="7563741676053287211">"ວຽກ​ພິມ"</string>
     <string name="print_restart" msgid="8373999687329384202">"ປິດເປີດໃໝ່"</string>
-    <string name="print_cancel" msgid="3621199386568672235">"ຍົກ​ເລີກ"</string>
+    <string name="print_cancel" msgid="3621199386568672235">"ຍົກ​ເລີກ​"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"ກຳລັງພິມ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"ກຳລັງຍົກເລີກ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
@@ -2151,8 +2151,8 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"ແລ້ວໆ"</string>
     <string name="zen_mode_option_off" msgid="7812737562592973403">"ປິດ"</string>
     <string name="zen_mode_option_on" msgid="6914392434474823822">"ເປີດ"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"ຈົນກວ່າ​ທ່ານ​ຈະ​ປິດ"</string>
-    <string name="zen_mode_general_category" msgid="4816396530154508930">"ບລັອກ​ທຸກ​ການ​ລົບ​ກວນ​ຍົກ​ເວັ້ນ"</string>
+    <string name="zen_mode_default_option" msgid="6940069025071935243">"ຈົນກວ່າ​ທ່ານ​ຈະ​ປິດ​"</string>
+    <string name="zen_mode_general_category" msgid="4816396530154508930">"ບລັອກ​ທຸກ​ການ​ລົບ​ກວນ​ຍົກ​ເວັ້ນ​"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"ໃນ​ຕອນ​ກາງ​ຄືນ"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"ລະ​ບົບ​ອັດ​ຕະ​ໂນ​ມັດ​ອື່ນໆ"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"ເປີດ​ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ"</string>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index e7b1bf8..8437917 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -758,8 +758,8 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Perjungti padėtį automatiškai, kai sukamas telefonas"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Sukant planšetinį kompiuterį automatiškai perjungti orientaciją"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Perjungti padėtį automatiškai, kai sukamas telefonas"</string>
-    <string name="brightness" msgid="2354961343555249270">"Ryškumas"</string>
-    <string name="brightness_summary" msgid="838917350127550703">"Reguliuoti ekrano ryškumą"</string>
+    <string name="brightness" msgid="2354961343555249270">"Šviesumas"</string>
+    <string name="brightness_summary" msgid="838917350127550703">"Reguliuoti ekrano šviesumą"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Užmigti"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neveiklumo"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Darbalaukio fonas"</string>
@@ -774,7 +774,7 @@
     <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kada svajoti"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Pradėti dabar"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Nustatymai"</string>
-    <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis ryškumas"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis šviesumas"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Šrifto dydis"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kortelės užrakto nustatymai"</string>
@@ -1414,7 +1414,7 @@
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Spalvų inversija"</string>
     <string name="accessibility_display_daltonizer_preference_title" msgid="4034958017657406631">"Spalvų erdvės koregavimas"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Rodyti sparčiuosiuose nustatymuose"</string>
-    <string name="contrast_brightness" msgid="8602573248029383063">"Skaistis"</string>
+    <string name="contrast_brightness" msgid="8602573248029383063">"Šviesumas"</string>
     <string name="contrast_contrast" msgid="3269496789297300264">"Kontrastas"</string>
     <string name="inversion_type" msgid="1582233332474243333">"Inversijos režimas"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Koregavimo režimas"</string>
@@ -1679,7 +1679,7 @@
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_location" msgid="2974757497945178165">"Vietovė"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sinchronizavimas"</string>
-    <string name="gadget_brightness_template" msgid="930541920933123603">"Skaistis <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Šviesumas <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatinis"</string>
     <string name="gadget_brightness_state_full" msgid="6814570109772137631">"visiškas"</string>
     <string name="gadget_brightness_state_half" msgid="3696671957608774204">"pusinis"</string>

diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 4d5dd18..280cf75 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml

@@ -1887,10 +1887,8 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Had proses latar belakang"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Tunjukkan semua ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Tunjukkan dialog Aplikasi Tidak Memberi Maklum Balas untuk aplikasi latar belakang"</string>
-    <!-- no translation found for webview_data_reduction_proxy (9184006980398676807) -->
-    <skip />
-    <!-- no translation found for webview_data_reduction_proxy_summary (4743441353857190066) -->
-    <skip />
+    <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Krgkn Pgunaan Rangkaian"</string>
+    <string name="webview_data_reduction_proxy_summary" msgid="4743441353857190066">"Kurangkan penggunaan rangkaian dengan memproksi sambungan WebView melalui pelayan pemampatan Google (Eksperimen)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Kitaran penggunaan data"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Perayauan data"</string>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 2791818..7e0da7e 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -1888,10 +1888,8 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limita proces. de fundal"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Afişaţi toate elem. ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Afiş. dialog. Aplic. nu răsp. pt. aplic. de fundal"</string>
-    <!-- no translation found for webview_data_reduction_proxy (9184006980398676807) -->
-    <skip />
-    <!-- no translation found for webview_data_reduction_proxy_summary (4743441353857190066) -->
-    <skip />
+    <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Reduceți utilizarea WebView"</string>
+    <string name="webview_data_reduction_proxy_summary" msgid="4743441353857190066">"Reduceți utilizarea rețelei folosind ca proxy pentru conexiunile WebView serverele de comprimare Google (experimental)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilizarea datelor"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclul de util. a datelor"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming de date"</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 28c1a55..1599bd2 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -481,7 +481,7 @@
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Поиск..."</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Настройки устройства"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Подключенные устройства"</string>
-    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Список"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Доступные устройства"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Подключить"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Отключить"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Выполнить сопряжение и подключить"</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c3d3560..ed0c231 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -1644,7 +1644,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Конфигуриши"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Изабери други уређај"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ова технологија за синтезу говора можда може да прикупља сав текст који ће бити изговорен, укључујући личне податке као што су лозинке и бројеви кредитних картица. То потиче из технологије <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Желите ли да омогућите коришћење ове технологије за синтезу говора?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"За овај језик је потребна исправна мрежна веза за претварање језика у говор."</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"За овај језик је потребна исправна мрежна веза за претварање текста у говор."</string>
     <string name="tts_default_sample_string" msgid="4040835213373086322">"Ово је пример синтезе говора"</string>
     <string name="tts_status_title" msgid="7268566550242584413">"Статус подразумеваног језика"</string>
     <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> је подржан у потпуности"</string>

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 336a372..0081ad3 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java

@@ -46,7 +46,6 @@
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
         modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockGenericFragment.class.getName());
-        modIntent.putExtra(EXTRA_NO_HEADERS, true);
         return modIntent;
     }
 

diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 4d102a4..90cd251 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java

@@ -58,7 +58,6 @@
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
         modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockPasswordFragment.class.getName());
-        modIntent.putExtra(EXTRA_NO_HEADERS, true);
         return modIntent;
     }
 

diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 5a939aa..c13cea2 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java

@@ -63,7 +63,6 @@
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
         modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockPatternFragment.class.getName());
-        modIntent.putExtra(EXTRA_NO_HEADERS, true);
         return modIntent;
     }
 

diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index a2302bb..52aa1d9 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java

@@ -48,7 +48,6 @@
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
         modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ConfirmLockPasswordFragment.class.getName());
-        modIntent.putExtra(EXTRA_NO_HEADERS, true);
         return modIntent;
     }
 

diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index a4b9991..9405f6d 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java

@@ -72,7 +72,6 @@
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
         modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ConfirmLockPatternFragment.class.getName());
-        modIntent.putExtra(EXTRA_NO_HEADERS, true);
         return modIntent;
     }
 

diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index 41cd75d..9119f7b 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java

@@ -150,7 +150,7 @@
 
         // create "start" action
         MenuItem start = createMenuItem(menu, R.string.screensaver_settings_dream_start,
-                MenuItem.SHOW_AS_ACTION_ALWAYS,
+                MenuItem.SHOW_AS_ACTION_NEVER,
                 isEnabled, new Runnable(){
                     @Override
                     public void run() {
@@ -160,7 +160,7 @@
         // create "when to dream" overflow menu item
         MenuItem whenToDream = createMenuItem(menu,
                 R.string.screensaver_settings_when_to_dream,
-                MenuItem.SHOW_AS_ACTION_IF_ROOM,
+                MenuItem.SHOW_AS_ACTION_NEVER,
                 isEnabled,
                 new Runnable() {
                     @Override

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 2b580e4..f814a9b 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java

@@ -77,7 +77,6 @@
 import com.android.settings.dashboard.DashboardCategory;
 import com.android.settings.dashboard.DashboardSummary;
 import com.android.settings.dashboard.DashboardTile;
-import com.android.settings.dashboard.Header;
 import com.android.settings.dashboard.NoHomeDialogFragment;
 import com.android.settings.dashboard.SearchResultsSummary;
 import com.android.settings.deviceinfo.Memory;
@@ -115,7 +114,7 @@
 import java.util.Comparator;
 import java.util.List;
 
-import static com.android.settings.dashboard.Header.HEADER_ID_UNDEFINED;
+import static com.android.settings.dashboard.DashboardTile.TILE_ID_UNDEFINED;
 
 public class SettingsActivity extends Activity
         implements PreferenceManager.OnPreferenceTreeClickListener,
@@ -154,15 +153,6 @@
      */
     public static final String EXTRA_FRAGMENT_ARG_KEY = ":settings:fragment_args_key";
 
-    /**
-     * When starting this activity, the invoking Intent can contain this extra
-     * boolean that the header list should not be displayed.  This is most often
-     * used in conjunction with {@link #EXTRA_SHOW_FRAGMENT} to launch
-     * the activity to display a specific fragment that the user has navigated
-     * to.
-     */
-    public static final String EXTRA_NO_HEADERS = ":settings:no_headers";
-
     public static final String BACK_STACK_PREFS = ":settings:prefs";
 
     // extras that allow any preference activity to be launched as part of a wizard
@@ -314,6 +304,8 @@
     private ActionBar mActionBar;
     private boolean mDisplayHomeAsUpEnabled;
 
+    private boolean mIsShowingDashboard;
+
     private SearchView mSearchView;
     private MenuItem mSearchMenuItem;
     private boolean mSearchMenuItemExpanded = false;
@@ -397,6 +389,11 @@
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
+        // Only show the Search menu on the main screen (Dashboard)
+        if (!mIsShowingDashboard) {
+            return true;
+        }
+
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.options_menu, menu);
 
@@ -452,7 +449,9 @@
         // Getting Intent properties can only be done after the super.onCreate(...)
         final String initialFragmentName = getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT);
 
-        if (initialFragmentName == null) {
+        mIsShowingDashboard = (initialFragmentName == null);
+
+        if (mIsShowingDashboard) {
             Index.getInstance(this).update();
         }
 
@@ -478,7 +477,7 @@
             // We need to build the Categories in all cases
             buildDashboardCategories(mCategories);
 
-            if (initialFragmentName != null) {
+            if (!mIsShowingDashboard) {
                 final ComponentName cn = getIntent().getComponent();
                 // No UP is we are launched thru a Settings shortcut
                 if (!cn.getClassName().equals(SubSettings.class.getName())) {
@@ -492,7 +491,7 @@
                 switchToFragment( initialFragmentName, initialArguments, true, false,
                         mInitialTitle, false);
             } else {
-                // No UP if we are displaying the Headers
+                // No UP if we are displaying the main Dashboard
                 mDisplayHomeAsUpEnabled = false;
                 if (mCategories.size() > 0) {
                     mInitialTitle = getText(R.string.dashboard_title);
@@ -671,36 +670,6 @@
         return false;
     }
 
-    /**
-     * When in two-pane mode, switch to the fragment pane to show the given
-     * preference fragment.
-     *
-     * @param header The new header to display.
-     * @param position The position of the Header in the list.
-     */
-    private void onHeaderClick(Header header, int position) {
-        if (header == null) {
-            return;
-        }
-        if (header.fragment != null) {
-            Utils.startWithFragment(this, header.fragment, header.fragmentArguments, null, 0,
-                    header.getTitle(getResources()));
-        } else if (header.intent != null) {
-            startActivity(header.intent);
-        }
-    }
-
-    /**
-     * Called to determine whether the header list should be hidden.
-     * The default implementation returns the
-     * value given in {@link #EXTRA_NO_HEADERS} or false if it is not supplied.
-     * This is set to false, for example, when the activity is being re-launched
-     * to show a particular preference activity.
-     */
-    public boolean onIsHidingHeaders() {
-        return getIntent().getBooleanExtra(EXTRA_NO_HEADERS, false);
-    }
-
     @Override
     public Intent getIntent() {
         Intent superIntent = super.getIntent();
@@ -919,7 +888,7 @@
                                     attrs, com.android.internal.R.styleable.PreferenceHeader);
                             tile.id = sa.getResourceId(
                                     com.android.internal.R.styleable.PreferenceHeader_id,
-                                    (int)HEADER_ID_UNDEFINED);
+                                    (int)TILE_ID_UNDEFINED);
                             tv = sa.peekValue(
                                     com.android.internal.R.styleable.PreferenceHeader_title);
                             if (tv != null && tv.type == TypedValue.TYPE_STRING) {
@@ -1069,6 +1038,12 @@
                             category.removeTile(n);
                         }
                     }
+                } else if (id == R.id.print_settings) {
+                    boolean hasPrintingSupport = getPackageManager().hasSystemFeature(
+                            PackageManager.FEATURE_PRINTING);
+                    if (!hasPrintingSupport) {
+                        category.removeTile(n);
+                    }
                 } else if (id == R.id.development_settings) {
                     if (!showDev || um.hasUserRestriction(
                             UserManager.DISALLOW_DEBUGGING_FEATURES)) {

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index e3335b8..36e1904 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java

@@ -58,7 +58,6 @@
 import android.widget.TabWidget;
 import com.android.settings.dashboard.DashboardCategory;
 import com.android.settings.dashboard.DashboardTile;
-import com.android.settings.dashboard.Header;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -152,154 +151,6 @@
         return false;
     }
 
-    /**
-     * Finds a matching activity for a preference's intent. If a matching
-     * activity is not found, it will remove the preference. The icon, title and
-     * summary of the preference will also be updated with the values retrieved
-     * from the activity's meta-data elements. If no meta-data elements are
-     * specified then the preference title will be set to match the label of the
-     * activity, an icon and summary text will not be displayed.
-     *
-     * @param context The context.
-     * @param parentPreferenceGroup The preference group that contains the
-     *            preference whose intent is being resolved.
-     * @param preferenceKey The key of the preference whose intent is being
-     *            resolved.
-     *
-     * @return Whether an activity was found. If false, the preference was
-     *         removed.
-     *
-     * @see {@link #META_DATA_PREFERENCE_ICON}
-     *      {@link #META_DATA_PREFERENCE_TITLE}
-     *      {@link #META_DATA_PREFERENCE_SUMMARY}
-     */
-    public static boolean updatePreferenceToSpecificActivityFromMetaDataOrRemove(Context context,
-            PreferenceGroup parentPreferenceGroup, String preferenceKey) {
-
-        IconPreferenceScreen preference = (IconPreferenceScreen)parentPreferenceGroup
-                .findPreference(preferenceKey);
-        if (preference == null) {
-            return false;
-        }
-
-        Intent intent = preference.getIntent();
-        if (intent != null) {
-            // Find the activity that is in the system image
-            PackageManager pm = context.getPackageManager();
-            List<ResolveInfo> list = pm.queryIntentActivities(intent, PackageManager.GET_META_DATA);
-            int listSize = list.size();
-            for (int i = 0; i < listSize; i++) {
-                ResolveInfo resolveInfo = list.get(i);
-                if ((resolveInfo.activityInfo.applicationInfo.flags
-                        & ApplicationInfo.FLAG_SYSTEM) != 0) {
-                    Drawable icon = null;
-                    String title = null;
-                    String summary = null;
-
-                    // Get the activity's meta-data
-                    try {
-                        Resources res = pm
-                                .getResourcesForApplication(resolveInfo.activityInfo.packageName);
-                        Bundle metaData = resolveInfo.activityInfo.metaData;
-
-                        if (res != null && metaData != null) {
-                            icon = res.getDrawable(metaData.getInt(META_DATA_PREFERENCE_ICON));
-                            title = res.getString(metaData.getInt(META_DATA_PREFERENCE_TITLE));
-                            summary = res.getString(metaData.getInt(META_DATA_PREFERENCE_SUMMARY));
-                        }
-                    } catch (NameNotFoundException e) {
-                        // Ignore
-                    } catch (NotFoundException e) {
-                        // Ignore
-                    }
-
-                    // Set the preference title to the activity's label if no
-                    // meta-data is found
-                    if (TextUtils.isEmpty(title)) {
-                        title = resolveInfo.loadLabel(pm).toString();
-                    }
-
-                    // Set icon, title and summary for the preference
-                    preference.setIcon(icon);
-                    preference.setTitle(title);
-                    preference.setSummary(summary);
-
-                    // Replace the intent with this specific activity
-                    preference.setIntent(new Intent().setClassName(
-                            resolveInfo.activityInfo.packageName,
-                            resolveInfo.activityInfo.name));
-
-                   return true;
-                }
-            }
-        }
-
-        // Did not find a matching activity, so remove the preference
-        parentPreferenceGroup.removePreference(preference);
-
-        return false;
-    }
-
-    public static boolean updateHeaderToSpecificActivityFromMetaDataOrRemove(Context context,
-            List<Header> target, Header header) {
-
-        Intent intent = header.intent;
-        if (intent != null) {
-            // Find the activity that is in the system image
-            PackageManager pm = context.getPackageManager();
-            List<ResolveInfo> list = pm.queryIntentActivities(intent, PackageManager.GET_META_DATA);
-            int listSize = list.size();
-            for (int i = 0; i < listSize; i++) {
-                ResolveInfo resolveInfo = list.get(i);
-                if ((resolveInfo.activityInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM)
-                        != 0) {
-                    Drawable icon = null;
-                    String title = null;
-                    String summary = null;
-
-                    // Get the activity's meta-data
-                    try {
-                        Resources res = pm.getResourcesForApplication(
-                                resolveInfo.activityInfo.packageName);
-                        Bundle metaData = resolveInfo.activityInfo.metaData;
-
-                        if (res != null && metaData != null) {
-                            icon = res.getDrawable(metaData.getInt(META_DATA_PREFERENCE_ICON));
-                            title = res.getString(metaData.getInt(META_DATA_PREFERENCE_TITLE));
-                            summary = res.getString(metaData.getInt(META_DATA_PREFERENCE_SUMMARY));
-                        }
-                    } catch (NameNotFoundException e) {
-                        // Ignore
-                    } catch (NotFoundException e) {
-                        // Ignore
-                    }
-
-                    // Set the preference title to the activity's label if no
-                    // meta-data is found
-                    if (TextUtils.isEmpty(title)) {
-                        title = resolveInfo.loadLabel(pm).toString();
-                    }
-
-                    // Set icon, title and summary for the preference
-                    // TODO:
-                    //header.icon = icon;
-                    header.title = title;
-                    header.summary = summary;
-                    // Replace the intent with this specific activity
-                    header.intent = new Intent().setClassName(resolveInfo.activityInfo.packageName,
-                            resolveInfo.activityInfo.name);
-
-                    return true;
-                }
-            }
-        }
-
-        // Did not find a matching activity, so remove the preference
-        target.remove(header);
-
-        return false;
-    }
-
     public static boolean updateTileToSpecificActivityFromMetaDataOrRemove(Context context,
             DashboardCategory target, DashboardTile tile) {
 
@@ -704,7 +555,6 @@
         intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, fragmentName);
         intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
         intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE, title);
-        intent.putExtra(SettingsActivity.EXTRA_NO_HEADERS, true);
         return intent;
     }
 }

diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index a6901ad..6558cc7 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java

@@ -146,9 +146,7 @@
 
     public void setTitle(String title) {
         final SettingsActivity activity = (SettingsActivity) getActivity();
-        if (!activity.onIsHidingHeaders()) {
-            getActivity().setTitle(title);
-        }
+        getActivity().setTitle(title);
     }
 
     protected void onProcessArguments(Bundle arguments) {

diff --git a/src/com/android/settings/accounts/SyncSettingsActivity.java b/src/com/android/settings/accounts/SyncSettingsActivity.java
index 9b1bc32..014c24d 100644
--- a/src/com/android/settings/accounts/SyncSettingsActivity.java
+++ b/src/com/android/settings/accounts/SyncSettingsActivity.java

@@ -29,7 +29,6 @@
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
         modIntent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, SyncSettings.class.getName());
-        modIntent.putExtra(SettingsActivity.EXTRA_NO_HEADERS, true);
         return modIntent;
     }
 

diff --git a/src/com/android/settings/applications/InstalledAppDetailsTop.java b/src/com/android/settings/applications/InstalledAppDetailsTop.java
index e731c1c..e078729 100644
--- a/src/com/android/settings/applications/InstalledAppDetailsTop.java
+++ b/src/com/android/settings/applications/InstalledAppDetailsTop.java

@@ -25,7 +25,6 @@
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
         modIntent.putExtra(EXTRA_SHOW_FRAGMENT, InstalledAppDetails.class.getName());
-        modIntent.putExtra(EXTRA_NO_HEADERS, true);
         return modIntent;
     }
 

diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index b505a3f..5f5b1f8 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java

@@ -141,10 +141,8 @@
     public void onStop() {
         super.onStop();
         final SettingsActivity activity = (SettingsActivity) getActivity();
-        if (!activity.onIsHidingHeaders()) {
-            activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);
-            activity.getActionBar().setCustomView(null);
-        }
+        activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);
+        activity.getActionBar().setCustomView(null);
     }
 
     @Override

diff --git a/src/com/android/settings/dashboard/Header.java b/src/com/android/settings/dashboard/Header.java
deleted file mode 100644
index 86e55ac..0000000
--- a/src/com/android/settings/dashboard/Header.java
+++ /dev/null

@@ -1,177 +0,0 @@
-/*
- * Copyright (C) 2014 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.dashboard;
-
-import android.content.Intent;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.text.TextUtils;
-
-/**
- * Description of a single Header item that the user can select.
- */
-public class Header implements Parcelable {
-    /**
-     * Default value for {@link Header#id Header.id} indicating that no
-     * identifier value is set.  All other values (including those below -1)
-     * are valid.
-     */
-    public static final long HEADER_ID_UNDEFINED = -1;
-
-    /**
-     * Identifier for this header, to correlate with a new list when
-     * it is updated.  The default value is
-     * {@link Header#HEADER_ID_UNDEFINED}, meaning no id.
-     * @attr ref android.R.styleable#PreferenceHeader_id
-     */
-    public long id = HEADER_ID_UNDEFINED;
-
-    /**
-     * Resource ID of title of the header that is shown to the user.
-     * @attr ref android.R.styleable#PreferenceHeader_title
-     */
-    public int titleRes;
-
-    /**
-     * Title of the header that is shown to the user.
-     * @attr ref android.R.styleable#PreferenceHeader_title
-     */
-    public CharSequence title;
-
-    /**
-     * Resource ID of optional summary describing what this header controls.
-     * @attr ref android.R.styleable#PreferenceHeader_summary
-     */
-    public int summaryRes;
-
-    /**
-     * Optional summary describing what this header controls.
-     * @attr ref android.R.styleable#PreferenceHeader_summary
-     */
-    public CharSequence summary;
-
-    /**
-     * Optional icon resource to show for this header.
-     * @attr ref android.R.styleable#PreferenceHeader_icon
-     */
-    public int iconRes;
-
-    /**
-     * Full class name of the fragment to display when this header is
-     * selected.
-     * @attr ref android.R.styleable#PreferenceHeader_fragment
-     */
-    public String fragment;
-
-    /**
-     * Optional arguments to supply to the fragment when it is
-     * instantiated.
-     */
-    public Bundle fragmentArguments;
-
-    /**
-     * Intent to launch when the preference is selected.
-     */
-    public Intent intent;
-
-    /**
-     * Optional additional data for use by subclasses of the activity
-     */
-    public Bundle extras;
-
-    public Header() {
-        // Empty
-    }
-
-    /**
-     * Return the currently set title.  If {@link #titleRes} is set,
-     * this resource is loaded from <var>res</var> and returned.  Otherwise
-     * {@link #title} is returned.
-     */
-    public CharSequence getTitle(Resources res) {
-        if (titleRes != 0) {
-            return res.getText(titleRes);
-        }
-        return title;
-    }
-
-    /**
-     * Return the currently set summary.  If {@link #summaryRes} is set,
-     * this resource is loaded from <var>res</var> and returned.  Otherwise
-     * {@link #summary} is returned.
-     */
-    public CharSequence getSummary(Resources res) {
-        if (summaryRes != 0) {
-            return res.getText(summaryRes);
-        }
-        return summary;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeLong(id);
-        dest.writeInt(titleRes);
-        TextUtils.writeToParcel(title, dest, flags);
-        dest.writeInt(summaryRes);
-        TextUtils.writeToParcel(summary, dest, flags);
-        dest.writeInt(iconRes);
-        dest.writeString(fragment);
-        dest.writeBundle(fragmentArguments);
-        if (intent != null) {
-            dest.writeInt(1);
-            intent.writeToParcel(dest, flags);
-        } else {
-            dest.writeInt(0);
-        }
-        dest.writeBundle(extras);
-    }
-
-    public void readFromParcel(Parcel in) {
-        id = in.readLong();
-        titleRes = in.readInt();
-        title = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
-        summaryRes = in.readInt();
-        summary = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
-        iconRes = in.readInt();
-        fragment = in.readString();
-        fragmentArguments = in.readBundle();
-        if (in.readInt() != 0) {
-            intent = Intent.CREATOR.createFromParcel(in);
-        }
-        extras = in.readBundle();
-    }
-
-    Header(Parcel in) {
-        readFromParcel(in);
-    }
-
-    public static final Creator<Header> CREATOR = new Creator<Header>() {
-        public Header createFromParcel(Parcel source) {
-            return new Header(source);
-        }
-        public Header[] newArray(int size) {
-            return new Header[size];
-        }
-    };
-}

diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java
index 67e32ab..da95b47 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java

@@ -25,7 +25,6 @@
         final Intent modIntent = new Intent(super.getIntent());
         if (!modIntent.hasExtra(EXTRA_SHOW_FRAGMENT)) {
             modIntent.putExtra(EXTRA_SHOW_FRAGMENT, InputMethodAndSubtypeEnabler.class.getName());
-            modIntent.putExtra(EXTRA_NO_HEADERS, true);
         }
         return modIntent;
     }

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 9a2180e..4e702b5 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java

@@ -416,24 +416,17 @@
             final Activity activity = getActivity();
 
             mSwitch = new Switch(activity.getActionBar().getThemedContext());
-            boolean addSwitch = true;
 
-            if (activity instanceof WifiPickerActivity) {
-                PreferenceActivity pa = (PreferenceActivity) activity;
-                addSwitch = pa.onIsHidingHeaders();
-            }
+            final int padding = activity.getResources().getDimensionPixelSize(
+                    R.dimen.action_bar_switch_padding);
+            mSwitch.setPaddingRelative(0, 0, padding, 0);
 
-            if (addSwitch) {
-                final int padding = activity.getResources().getDimensionPixelSize(
-                        R.dimen.action_bar_switch_padding);
-                mSwitch.setPaddingRelative(0, 0, padding, 0);
-                activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
-                        ActionBar.DISPLAY_SHOW_CUSTOM);
-                activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams(
-                        ActionBar.LayoutParams.WRAP_CONTENT,
-                        ActionBar.LayoutParams.WRAP_CONTENT,
-                        Gravity.CENTER_VERTICAL | Gravity.END));
-            }
+            activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                    ActionBar.DISPLAY_SHOW_CUSTOM);
+            activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams(
+                    ActionBar.LayoutParams.WRAP_CONTENT,
+                    ActionBar.LayoutParams.WRAP_CONTENT,
+                    Gravity.CENTER_VERTICAL | Gravity.END));
 
             mWifiEnabler = new WifiEnabler(activity, mSwitch);
         }
@@ -442,19 +435,9 @@
     @Override
     public void onStop() {
         super.onStop();
-        Activity activity = getActivity();
-        boolean onIsHidingHeaders = true;
-        if (activity instanceof SettingsActivity){
-            SettingsActivity sa = (SettingsActivity) activity;
-            onIsHidingHeaders = sa.onIsHidingHeaders();
-        } else if (activity instanceof PreferenceActivity) {
-            PreferenceActivity pa = (PreferenceActivity) activity;
-            onIsHidingHeaders = pa.onIsHidingHeaders();
-        }
-        if (!onIsHidingHeaders) {
-            activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);
-            activity.getActionBar().setCustomView(null);
-        }
+        final Activity activity = getActivity();
+        activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);
+        activity.getActionBar().setCustomView(null);
     }
 
     @Override