diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3e8832d..f34f4af 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"طلب اقتران البلوتوث"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"طلب اقتران"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"تحديد للاقتران مع <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"إظهار الملفات المستلمة"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"إظهار قائمة بالملفات المستلمة عبر بلوتوث"</string>
     <string name="device_picker" msgid="8721012448931226323">"منتقي جهاز البلوتوث"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"طلب إذن بلوتوث"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"هناك تطبيق يطلب الإذن لتشغيل البلوتوث. هل تريد إجراء ذلك؟"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"تحديد المشغل"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"تحديد مشغل شبكة"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"التاريخ والوقت"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"تعيين التاريخ والوقت"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"تعيين التاريخ والوقت"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"تعيين التاريخ والوقت والمنطقة الزمنية والتنسيقات"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"التاريخ والوقت التلقائي"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"استخدام الوقت المقدم للشبكة"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين بطاقة SIM، تأمين تخزين الاعتماد"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين تخزين الاعتماد"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"كلمات المرور"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"تشفير الجهاز"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"تشفير البيانات على الجهاز"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"تشفير البيانات على الجهاز"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"يتطلب تعيين رقم تعريف شخصي أو كلمة مرور لإلغاء تأمين الجهاز."</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"يتطلب تعيين رقم تعريف شخصي أو كلمة مرور لإلغاء تأمين الجهاز."</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"مشفّر"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"يمكنك تشفير حساباتك وإعداداتك والتطبيقات التي تم تنزيلها وبياناتها والوسائط وملفات أخرى. بعد تشفير هاتفك، لا يمكنك إلغاء تشفيره إلا عن طريق تنفيذ عملية إعادة الضبط بحسب بيانات المصنع، مما يؤدي إلى مسح جميع البيانات في هاتفك."\n\n"يستغرق التشفير ما يصل إلى ساعة. يجب عليك البدء ببطارية تم شحنها والحفاظ على توصيل هاتفك بمصدر للطاقة، وذلك لحين انتهاء التشفير. إذا قاطعت عملية التشفير أثناء إجرائها، فستفقد بعض أو جميع بياناتك."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"يمكنك تشفير حساباتك وإعداداتك والتطبيقات التي تم تنزيلها وبياناتها والوسائط وملفات أخرى. بعد تشفير هاتفك، لا يمكنك إلغاء تشفيره إلا عن طريق تنفيذ عملية إعادة الضبط بحسب بيانات المصنع، مما يؤدي إلى مسح جميع البيانات في هاتفك."\n\n"يستغرق التشفير ما يصل إلى ساعة. يجب عليك البدء ببطارية تم شحنها والحفاظ على توصيل هاتفك بمصدر للطاقة، وذلك لحين انتهاء التشفير. إذا قاطعت عملية التشفير أثناء إجرائها، فستفقد بعض أو جميع بياناتك."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"تشفير الجهاز اللوحي"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"تشفير الهاتف"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"تأكيد التشفير"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"هل تريد تشفير بيانات المستخدم؟ لا يمكن التراجع عن هذه العملية وربما يتم فقد بعض البيانات في حالة مقاطعة هذه العملية. قد يستغرق التشفير ما يصل إلى ساعة."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"هل تريد تشفير بيانات المستخدم؟ لا يمكن التراجع عن هذه العملية وربما يتم فقد بعض البيانات في حالة مقاطعة هذه العملية. قد يستغرق التشفير ما يصل إلى ساعة."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"التشفير"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"أعد المحاولة خلال ^1 ثانية."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"تهيئة تأمين الشاشة"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"تهيئة تأمين الشاشة"</string>
@@ -529,7 +524,7 @@
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"نقطة اتصال Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> المحمولة"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"الصوت"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"عرض على الشاشة"</string>
+    <string name="display_settings_title" msgid="2378894265964357591">"شاشة العرض"</string>
     <string name="sound_settings" msgid="5007659014828162881">"إعدادات الصوت"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"وضع صامت"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"جعل جميع الأصوات صامتة باستثناء الوسائط والمنبّات"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"إعدادات وحدة التخزين"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"إلغاء تركيب وحدة تخزين USB، وعرض سعة التخزين المتاحة"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"إلغاء تحميل بطاقة SD، عرض سعة التخزين المتاحة"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"رقم هاتفي"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN (رقم دليل الجوال)"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"رقم هاتفي"</string>
     <string name="status_min_number" msgid="3519504522179420597">"دقيقة"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"إصدار PRL"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"وحدة التخزين الداخلية"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"وحدة تخزين USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"بطاقة SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"المساحة المتاحة"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"المساحة الإجمالية"</string>
+    <string name="memory_available" msgid="5052397223077021181">"متاح"</string>
+    <string name="memory_size" msgid="5458889090691922288">"المجموع"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"جارٍ الحساب..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"استخدام التطبيقات"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"استخدام الوسائط"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"التطبيقات"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"الوسائط"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"إلغاء تركيب وحدة التخزين المشتركة"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"إلغاء تحميل بطاقة SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"إلغاء تركيب وحدة تخزين USB الداخلية"</string>
@@ -737,10 +732,9 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"سيؤدي ذلك إلى محو كل البيانات من "<b>"وحدة التخزين الداخلية للجهاز اللوحي"</b>"، بما في ذلك:"\n\n<li>"حسابك على Google"</li>\n<li>"إعدادات وبيانات النظام والتطبيق"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"سيؤدي ذلك إلى محو كل البيانات من "<b>"وحدة التخزين الداخلية للهاتف"</b>"، بما في ذلك:"\n\n<li>"حسابك على Google"</li>\n<li>"إعدادات وبيانات النظام والتطبيق"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"تم تسجيل دخولك حاليًا في الحسابات التالية:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"الموسيقى"</li>\n<li>"الصور"</li>\n<li>"بيانات المستخدم الأخرى"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"لمسح الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يلزم محو "<b>"وحدة تخزين USB"</b>"."</string>
-    <!-- syntax error in translation for master_clear_desc_erase_external_storage (7339100478676372901) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:177 in java.io.StringReader@55e83f9)  -->
+    <!-- syntax error in translation for master_clear_desc_erase_external_storage (7339100478676372901) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:177 in java.io.StringReader@3ebfc8e0)  -->
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"محو وحدة تخزين USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"محو بطاقة SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"محو كل البيانات على وحدة تخزين USB الداخلية، مثل الموسيقى والصور."</string>
@@ -1113,7 +1107,7 @@
     <string name="bluetooth_on_time" msgid="6157799524996162271">"وقت تشغيل Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"تفاصيل السجل"</string>
-    <string name="details_title" msgid="3792801565213935385">"استخدام التفاصيل"</string>
+    <string name="details_title" msgid="3792801565213935385">"تفاصيل الاستخدام"</string>
     <string name="details_subtitle" msgid="32593908269911734">"استخدام التفاصيل"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"ضبط استخدام الطاقة"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"الحزم المضمنة"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"إعداد الشبكات الظاهرية الخاصة (VPN) وإدارتها"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(لم يتم التغيير)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(لم يتم التعيين)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"تخزين بيانات الاعتماد"</string>
     <string name="credentials_access" msgid="4843187230913860492">"استخدام بيانات الاعتماد الآمنة"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"السماح للتطبيقات بالوصول إلى الشهادات الآمنة وبيانات الاعتماد الأخرى"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"تثبيت من وحدة تخزين USB"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"التثبيت من بطاقة SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"تثبيت الشهادات من وحدة تخزين USB"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"تثبيت الشهادات من بطاقة SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"تعيين كلمة المرور"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"تعيين كلمة مرور تخزين بيانات الاعتماد أو تغييرها"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"مسح التخزين"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"مسح جميع المحتويات من تخزين بيانات الاعتماد وإعادة تعيين كلمة المرور"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"تعيين كلمة مرور لتخزين بيانات الاعتماد أو تغييرها"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"محو بيانات الاعتماد"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"إزالة جميع المحتويات وإعادة تعيين كلمة المرور"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"إدخال كلمة المرور"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"إدخال كلمة مرور تخزين بيانات الاعتماد."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"أدخل كلمة المرور تخزين بيانات الاعتماد."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"تعيين كلمة المرور لتخزين بيانات الاعتماد. يجب أن تكون 8 أحرف على الأقل."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"كلمة المرور الحالية:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"كلمة المرور الجديدة:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"تأكيد كلمة المرور الجديدة:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"هل تريد بالتأكيد حذف جميع بيانات الاعتماد وإعادة تعيين كلمة مرور تخزين بيانات الاعتماد؟"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"ستتم إزالة كل المحتويات، وإعادة تعيين كلمة المرور. هل تريد بالتأكيد إجراء ذلك؟"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"كلمتا المرور غير متطابقتين."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"يجب أن تحتوي كلمة المرور على 8 أحرف على الأقل."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"الرجاء إدخال كلمة المرور الصحيحة."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"الرجاء إدخال كلمة المرور الصحيحة. بقيت لديك محاولة واحدة لإدخال كلمة المرور الصحيحة قبل مسح تخزين بيانات الاعتماد."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"تم مسح تخزين بيانات الاعتماد."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"كلمة مرور غير صحيحة."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"كلمة مرور غير صحيحة. بقي لديك محاولة واحدة أخرى قبل مسح تخزين بيانات الاعتماد."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"كلمة مرور غير صحيحة. بقي لديك <xliff:g id="NUMBER">%1$d</xliff:g> من المحاولات قبل مسح تخزين بيانات الاعتماد."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"تم مسح تخزين بيانات الاعتماد."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"تم تمكين تخزين بيانات الاعتماد."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"نغمة الطوارئ"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"تعيين السلوك عند إجراء اتصال بالطوارئ"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"جارٍ الاتصال..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"متابعة إلى الخطوة التالية"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"شبكة EAP غير معتمدة."</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"لا يمكنك تهيئة اتصال EAP Wi-Fi أثناء الإعداد. بعد الإعداد، يمكنك القيام بذلك في الإعدادات، ضمن اللاسلكي والشبكات."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"لا يمكنك تهيئة اتصال Wi-Fi لشبكة EAP أثناء الإعداد. بعد الإعداد، يمكنك فعل ذلك من خلال الإعدادات ضمن "<b>"اللاسلكي والشبكات"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"يمكن أن يستغرق الاتصال عدة دقائق..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"المس "<b>"التالي"</b>" للاستمرار في الإعداد."\n\n"المس "<b>"رجوع"</b>" للاتصال بشبكة Wi-Fi مختلفة."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"إعدادات المزامنة"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"تواجه المزامنة حاليًا بعض المشاكل. وسوف تكون متاحة خلال وقت قصير."</string>
     <string name="add_account_label" msgid="7811707265834013767">"إضافة حساب"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"مزامنة هذا العنصر معطّلة في الوقت الحالي. لتغيير تفضيلاتك، شغّل بشكل مؤقت بيانات الخلفية والمزامنة التلقائية."</string>
     <string name="enter_password" msgid="3268224850821675915">"أدخل كلمة مرور لتشفير التخزين."</string>
     <string name="try_again" msgid="5904121494468643129">"عذرًا، أعد المحاولة."</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"الخدمة مشغولة، أعد المحاولة"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 4b54695..6220bf9 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Заявка за сдвояване чрез Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Заявка за сдвояване"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Избор за сдвояване с/ъс<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Показване на получени файлове"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Списък с файловете, получени през Bluetooth"</string>
     <string name="device_picker" msgid="8721012448931226323">"Избиране на Bluetooth устройство"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Заявка за разрешение на Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Приложение иска разрешение да включи Bluetooth. Искате ли да направите това?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Избор на оператора"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Избиране на мрежов оператор"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Дата и час"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Задаване на дата и час"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Задаване на дата и час"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Задаване на дата, час, часова зона и формати"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Автоматична дата и час"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Използване на часа, предоставен от мрежата"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Задаване на Моето местоположение, отключване на екран, заключване на SIM картата и на хранилището за идентификационни данни"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Задаване на Моето местоположение, отключване на екран и заключване на хранилището за идентификационни данни"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифроване на устройството"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифроване на данните в устройството"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Шифроване на данните в устройството"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Изисква да зададете PIN за отключване или парола за устройството"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Изисква да зададете PIN за отключване или парола за устройството"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Шифровано"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за телефона си, не можете да го разшифровате освен чрез възстановяване на фабричните настройки, което ще изтрие всичките данни в него."\n\n"Шифроването отнема до един час. Трябва да започнете със заредена батерия и телефонът ви да е включен към захранването, докато процесът завърши. Ако го прекъснете, ще загубите някои или всичките си данни."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за телефона си, не можете да го разшифровате освен чрез възстановяване на фабричните настройки, което ще изтрие всичките данни в него."\n\n"Шифроването отнема до един час. Трябва да започнете със заредена батерия и телефонът ви да е включен към захранването, докато процесът завърши. Ако го прекъснете, ще загубите някои или всичките си данни."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шифроване на таблета"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шифроване на телефона"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Потвърждаване на шифроването"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Да се шифроват ли потребителските данни? Тази операция не е обратима и не може да се прекъсва без загуба на информация! Шифроването може да отнеме до един час."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Да се шифроват ли потребителските данни? Тази операция не е обратима и не може да се прекъсва без загуба на информация! Шифроването може да отнеме до един час."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифроване"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Опитайте отново след ^1 секунди."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Конф. на закл. на екр."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Конф. на закл. на екр."</string>
@@ -471,7 +466,7 @@
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Въведете PIN код от точката за достъп"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Настройка на WPS"</string>
     <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Въведете PIN кода <xliff:g id="WPS_PIN">%1$s</xliff:g> на точката за достъп"</string>
-    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS вече е в ход и прикл. на настройката може да отнеме няколко секунди"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS вече е в ход и приключването може да отнеме няколко секунди"</string>
     <string name="wifi_wps_failed" msgid="2277409652621482331">"Стартирането на WPS не бе успешно. Моля, опитайте отново"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID на мрежа"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Сигурност"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Настройки на хранилището"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Спиране на USB хранилището, преглед на наличното хранилище"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Деактивиране на SD картата, преглед на налично хранилище"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Моят телефонен номер"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Моят телефонен номер"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL версия"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Вътрешно хранилище"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB хранилище"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD карта"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Налично място"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Общо място"</string>
+    <string name="memory_available" msgid="5052397223077021181">"На разположение"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Общо"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Изчислява се..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Използване от приложения"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Използване от мултимедия"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Приложения"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Мултимедия"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Спиране на сподел. хран."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Деактивиране на SD карта"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Спиране на вътрешното USB"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на таблета ви, включително:"\n\n<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:"\n\n<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Понастоящем сте влезли в следните профили:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Снимки"</li>\n<li>"Други потребителски данни"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"За да изчистите и музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"USB хранилището"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"За да изчистите и музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"SD картата"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Изтриване на USB хранилището"</string>
@@ -1005,7 +999,7 @@
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Автоматично заменяне"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Поправка на грешно написани думи"</string>
-    <string name="auto_caps" msgid="6379232078052591265">"Автоматично поставяне на главни букви"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Автоматични главни букви"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Прави всяка първа буква на изреченията главна"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Автоматично поставяне на пунктуация"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Настройки за физическа клавиатура"</string>
@@ -1049,7 +1043,7 @@
     <string name="active_input_method_subtypes" msgid="3596398805424733238">"Активни методи за въвеждане"</string>
     <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Използване на системен език"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Настройки за <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
-    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Избор на активни методи за въвеждане"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Избор: Активни методи за въвеждане"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Настройки за екранна клавиатура"</string>
     <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Вградена клавиатура"</string>
     <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Настройки за вградената физическа клавиатура"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Задаване и управление на частни виртуални мрежи (VPN)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(непроменени)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(не е зададенo)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Хранилище за идент. данни"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Използване на сигурни идентификационни данни"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Даване на достъп до защитени сертификати и други идентификационни данни"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Инсталиране от USB хранилището"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Инсталиране от SD картата"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Инсталиране на сертификати от USB хранилището"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Инсталиране на сертификати от SD картата"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Задаване на парола"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Задаване или промяна на паролата за хранилището за идентификационни данни"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Изчистване на хранилището"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Изчиства хранилището от цялото съдържание и му задава нова парола"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Задаване или промяна на паролата за хранилището за идентификационни данни"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Изчистване на идент. данни"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Премахване на цялото съдържание и задаване на нова парола"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Въвеждане на парола"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Въведете паролата за хранилището за идентификационни данни."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Въведете паролата за хранилището за идентификационни данни."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Задайте паролата за хранилището за идентификационни данни. Трябва да бъде поне 8 знака."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Текуща парола:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Нова парола:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Потвърждаване на нова парола:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Наистина ли искате да изтриете всички идентификационни данни и да зададете нова парола за хранилището им?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Цялото съдържание ще бъде премахнато и ще бъде зададена нова парола. Наистина ли искате да го направите?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Паролите не си съответстват."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Паролата трябва да е поне 8 знака."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Моля, въведете правилната парола."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Моля, въведете правилната парола. Имате още един опит преди хранилището за идентификационни данни да бъде изтрито."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"Хранилището за идентификационни данни е изтрито."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Паролата е неправилна."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Паролата е неправилна. Имате още една възможност, преди хранилището за идентификационни данни да бъде изтрито."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Паролата е неправилна. Имате още <xliff:g id="NUMBER">%1$d</xliff:g> възможности, преди хранилището за идентификационни данни да бъде изтрито."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Идент. данни: изтрито хранил."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Хранилището за идентификационни данни е активирано."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тон за спешност"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Задаване на поведение при спешно обаждане"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Свързва се…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Напред към следващата стъпка"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"Не се поддържа EAP"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Не можете да конфигурирате Wi-Fi връзка с редактиране на точка за достъп (EAP) по време на настройването. След това можете да го направите в „Настройки“ под „Кабелни и безжични мрежи“."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Не можете да конфигурирате Wi-Fi връзка с редактиране на точката за достъп (EAP) по време на настройката. След това можете да го направите от „Настройки“ в "<b>"Кабелни и безжични мрежи"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Свързването може да отнеме няколко минути..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Докоснете "<b>"Напред"</b>", за да продължите с настройката."\n\n"Докоснете "<b>"Назад"</b>", за да се свържете с друга Wi-Fi мрежа."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Настройки за синхрон"</string>
     <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Синхронизирането понастоящем има проблеми. Ще се върне скоро."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Добавяне на профил"</string>
@@ -1405,7 +1390,7 @@
     <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Календар"</string>
     <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Контакти"</string>
-    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Добре дошли в Google Синхронизиране!"</font>" "\n"Подходът на Google към синхронизирането на данни за предоставянето на достъп до контактите ви, срещите ви и много други неща, където и да сте."</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Добре дошли в Google Синхронизиране!"</font>" "\n"Подходът на Google към синхронизирането на данни, за да ви осигурим достъп до контактите ви, срещите ви и много други неща, където и да сте."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Настройки за синхронизиране на приложения"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Данни и синхронизиране"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Промяна на паролата"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Синхронизирането за този елемент понастоящем е деактивирано. За да промените предпочитанието си, временно включете данните на заден план и автоматичното синхронизиране."</string>
     <string name="enter_password" msgid="3268224850821675915">"Въведете паролата, за да дешифрирате хранилището"</string>
     <string name="try_again" msgid="5904121494468643129">"Съжаляваме, опитайте отново"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Услугата е заета, опитайте отново"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 842e8af..79cecd1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Sol·licitud d\'emparellament de Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Sol·licitud d\'emparellament"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Selecciona l\'emparellament amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Mostra els fitxers rebuts"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Mostra llista fitxers rebuts mitjançant Bluetooth"</string>
     <string name="device_picker" msgid="8721012448931226323">"Selector de dispositiu Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Sol·licitud de permís de Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Una aplicació està sol·licitant permís per activar Bluetooth. Vols fer-ho?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Selecció d\'operador"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Seleccioneu un operador de xarxa"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data i hora"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Establiment de la data i de l\'hora"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Establiment de data i d\'hora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Defineix la data, l\'hora, el fus horari i els formats"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Data i hora automàtiques"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utilitza l\'hora proporcionada per la xarxa"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Defineix La meva ubicació, el desbloqueig de la pantalla, el bloqueig de la targeta SIM i el bloqueig de l\'emmagatzematge de credencials"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Defineix La meva ubicació, el desbloqueig de pantalla i el bloqueig d\'emmagatzematge de credencials"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contrasenyes"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptació del dispositiu"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptació de les dades del dispositiu"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptació de les dades del dispositiu"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Sol·licita que defineixis un PIN o bé una contrasenya de desbloqueig del dispositiu"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Sol·licita que defineixis un PIN o bé una contrasenya de desbloqueig del dispositiu"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptat"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Pots encriptar els teus comptes, les configuracions, les aplicacions baixades i les seves dades, els elements multimèdia i altres fitxers. Una vegada encriptis el telèfon, no podràs desencriptar-lo tret que duguis a terme un restabliment de les dades de fàbrica, cosa que n\'esborrarà totes les dades."\n\n"L\'encriptació triga fins a una hora. Cal que iniciïs el procés amb la bateria carregada i que mantinguis el telèfon connectat fins que s\'hagi completat l\'encriptació. Si interromps el procés d\'encriptació, perdràs totes les dades o bé una part."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Pots encriptar els teus comptes, les configuracions, les aplicacions baixades i les seves dades, els elements multimèdia i altres fitxers. Una vegada encriptis el telèfon, no podràs desencriptar-lo tret que duguis a terme un restabliment de les dades de fàbrica, cosa que n\'esborrarà totes les dades."\n\n"L\'encriptació triga fins a una hora. Cal que iniciïs el procés amb la bateria carregada i que mantinguis el telèfon connectat fins que s\'hagi completat l\'encriptació. Si interromps el procés d\'encriptació, perdràs totes les dades o bé una part."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encripta la tauleta"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encripta el telèfon"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmació de l\'encriptació"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Vols encriptar les dades de l\'usuari? Aquesta operació no es pot desfer i no es pot interrompre sense que es perdin dades. L\'encriptació pot trigar fins a una hora."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Vols encriptar les dades de l\'usuari? Aquesta operació no es pot desfer i no es pot interrompre sense que es perdin dades. L\'encriptació pot trigar fins a una hora."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encriptació"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Torna-ho a provar d\'aquí a ^1 segon."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Configurar bloqueig"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Configuració del bloqueig de pantalla"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Configuració d\'emmagatzematge"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Desmunta l\'emmagatzematge USB, mostra l\'emmagatzematge disponible"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Desmunta la targeta SD, visualitza l\'emmagatzematge disponible"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"El meu número de telèfon"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"El meu número de telèfon"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versió de PRL"</string>
@@ -663,8 +658,8 @@
     <string name="internal_memory" msgid="9129595691484260784">"Emmagatzematge intern"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Emmagatzematge USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Targeta SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Espai disponible"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Espai total"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Disponible"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"S\'està calculant..."</string>
     <string name="memory_apps_usage" msgid="9079237985722858506">"Aplicacions"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimèdia"</string>
@@ -737,7 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Això esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, entre les quals s\'inclouen:"\n\n<li>"El teu Compte de Google"</li>\n<li>"Dades i configuració del sistema i d\'aplicacions"</li>\n<li>"Aplicacions baixades"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Això esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" del telèfon, inclosos:"\n\n<li>"El Compte de Google"</li>\n<li>"Dades i configuració del sistema i d\'aplicacions"</li>\n<li>"Aplicacions baixades"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualment has iniciat la sessió als comptes següents:"\n</string>
-    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li></li>\n<li></li>\n<li></li></string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Altres dades de l\'usuari"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Per esborrar també música, imatges i altres dades d\'usuari, cal esborrar l\'"<b>"emmagatzematge USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Si també vols suprimir música, imatges i altres dades de l\'usuari, cal que esborris la "<b>"targeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Esborra l\'emmagatzematge USB"</string>
@@ -1295,26 +1290,25 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Permet a les aplicacions accedir als certificats segurs i a altres credencials"</string>
     <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Instal·la des d\'emmag. USB"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instal·la des de la targeta SD"</string>
-    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Instal·la certificats encriptats d\'emmagatzematge USB"</string>
-    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instal·la els certificats encriptats des de la targeta SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Instal·la els certificats des de l\'emmagatzematge USB"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instal·la els certificats des de la targeta SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Defineix la contrasenya"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Defineix o canvia la contrasenya d\'emmagatzematge de credencials"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Esborra l\'emmagatzematge"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Esborra tot el contingut de l\'emmagatzematge de credencials i restableix-ne la contrasenya"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Estableix o canvia la contrasenya per a l\'emmagatzematge de credencials"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Esborra les credencials"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Elimina tot el contingut i restableix la contrasenya"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Introduïu la contrasenya"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introdueix la contrasenya d\'emmagatzematge de credencials."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introdueix la contrasenya per a l\'emmagatzematge de credencials."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Estableix la contrasenya per a l\'emmagatzematge de credencials. Ha de tenir com a mínim vuit caràcters."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contrasenya actual:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Contrasenya nova:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmeu la contrasenya nova:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Estàs segur que vols suprimir totes les credencials i restablir la contrasenya d\'emmagatzematge de credencials?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"S\'eliminarà tot el contingut i es restablirà la contrasenya. N\'estàs segur?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Les contrasenyes no coincideixen."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"La contrasenya ha de tenir almenys 8 caràcters."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"La contrasenya no és correcta."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Introdueix la contrasenya correcta. Tens un intent més per introduir la contrasenya correcta abans que s\'esborri l\'emmagatzematge de credencials."</string>
-    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"<xliff:g id="NUMBER">%1$d</xliff:g>"</string>
-    <string name="credentials_erased" msgid="2907836028586342969">"S\'ha esborrat l\'emmagatzematge de credencials."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Contrasenya incorrecta. Tens una oportunitat més abans que no s\'esborri l\'emmagatzematge de credencials."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Contrasenya incorrecta. Tens <xliff:g id="NUMBER">%1$d</xliff:g> oportunitats més abans que no s\'esborri l\'emmagatzematge de credencials."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Emmag. credencials esborrat."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"L\'emmagatzematge de credencials està activat."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"To d\'emergència"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Defineix el comportament quan es fa una trucada d\'emergència"</string>
@@ -1370,10 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"S\'està connectant..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Continua al pas següent"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP no és compatible"</string>
-    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939"><b>"No pots configurar una connexió EAP Wi-Fi durant la configuració. Ho pots fer després a Configuració, dins de Xarxes sense fil"</b>"."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459"><b></b>\n\n<b></b></string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"No pots configurar una connexió EAP Wi-Fi durant la configuració. Ho pots fer després a l\'opció \"Configuració\" de "<b>"Sense fil i xarxes"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"La connexió pot trigar una estona..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Toca "<b>"Següent"</b>" per continuar amb la configuració."\n\n"Toca "<b>"Enrere"</b>" per connectar-te a una altra xarxa Wi-Fi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Configuració de sincronització"</string>
     <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"La sincronització té problemes. Es tornarà a activar aviat."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Afegeix un compte"</string>
@@ -1416,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"En aquest moment, la sincronització d\'aquest element està desactivada. Per canviar la preferència, activa temporalment la sincronització automàtica i de les dades de fons."</string>
     <string name="enter_password" msgid="3268224850821675915">"Introdueix la contrasenya per desencriptar l\'emmagatzematge"</string>
     <string name="try_again" msgid="5904121494468643129">"Torna-ho a provar"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Servei ocupat; torna-ho a provar."</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index bac3267..7e2debb 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Požadavek na párování zařízení Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Požadavek na párování"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Vybrat k párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Zobrazit přijaté soubory"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Zobrazit seznam souborů přijatých pomocí technologie Bluetooth"</string>
     <string name="device_picker" msgid="8721012448931226323">"Výběr zařízení Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Požadavek na povolení zařízení Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Aplikace požaduje povolení zapnout připojení Bluetooth. Chcete toto povolení udělit?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Výběr operátora"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Vybrat síťového operátora"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum a čas"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Nastavit datum a čas"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Nastavit datum a čas"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Umožňuje nastavit datum, čas, časové pásmo a formát"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Automatické datum a čas"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Použít čas ze sítě"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavení funkce Moje poloha, odemknutí obrazovky a zamknutí úložiště pověření"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hesla"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrování zařízení"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifrovat data v zařízení"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifrovat data v zařízení"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Požaduje nastavit kód PIN nebo heslo pro odemčení zařízení"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Požaduje nastavit kód PIN nebo heslo pro odemčení zařízení"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrováno"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Své účty, nastavení, stažené aplikace a jejich data můžete šifrovat. Jakmile telefon zašifrujete, bude moci šifrování zrušit jedině tím, že obnovíte tovární data a veškerá data v telefonu se smažou."\n\n"Šifrování trvá asi hodinu. V telefonu musí být nabitá baterie a po celou dobu šifrování musí být zapojen ke zdroji elektřiny. Pokud proces šifrování přerušíte, ztratíte některá nebo všechna svá data."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Své účty, nastavení, stažené aplikace a jejich data můžete šifrovat. Jakmile telefon zašifrujete, bude moci šifrování zrušit jedině tím, že obnovíte tovární data a veškerá data v telefonu se smažou."\n\n"Šifrování trvá asi hodinu. V telefonu musí být nabitá baterie a po celou dobu šifrování musí být zapojen ke zdroji elektřiny. Pokud proces šifrování přerušíte, ztratíte některá nebo všechna svá data."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrovat tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrovat telefon"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Potvrdit šifrování"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Šifrovat uživatelská data? Tato operace se nedá vrátit a nesmí být přerušena, jinak může dojít ke ztrátě dat. Šifrování trvá asi hodinu."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Šifrovat uživatelská data? Tato operace se nedá vrátit a nesmí být přerušena, jinak může dojít ke ztrátě dat. Šifrování trvá asi hodinu."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifrování"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Sekundy zbývající do dalšího pokusu: ^1."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Konf. uzamč. obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Konf. uzamč. obrazovky"</string>
@@ -472,7 +467,7 @@
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Nastavení WPS"</string>
     <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Zadejte kód PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> přístupového bodu"</string>
     <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS probíhá a může trvat desítky sekund."</string>
-    <string name="wifi_wps_failed" msgid="2277409652621482331">"WPS se podařilo spustit, zkuste to prosím znovu."</string>
+    <string name="wifi_wps_failed" msgid="2277409652621482331">"WPS se nepodařilo spustit, zkuste to prosím znovu."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Identifikátor SSID sítě"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpečení"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Síla signálu"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Nastavení úložiště"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Odpojit úložiště USB a zobrazit dostupné úložiště"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Umožňuje odpojit kartu SD a zobrazit dostupnou paměť"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Moje telefonní číslo"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Moje telefonní číslo"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Verze PRL"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Interní úložiště"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Úložiště USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Karta SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Dostupná paměť"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Celková paměť"</string>
+    <string name="memory_available" msgid="5052397223077021181">"K dispozici"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Celkem"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Výpočet…"</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Využito aplikacemi"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Využito médii"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplikace"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Média"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odpojit sdílené úložiště"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Odpojit kartu SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Odpojit interní úložiště USB"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Tato operace vymaže všechna data v "<b>"interním úložišti"</b>" tabletu, včetně:"\n\n<li>"účtu Google,"</li>\n<li>"dat a nastavení aplikací a systému,"</li>\n<li>"stažených aplikací."</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Tato operace vymaže všechna data v "<b>"interním úložišti"</b>" telefonu, včetně:"\n\n<li>"účtu Google,"</li>\n<li>"dat a nastavení systému a aplikací,"</li>\n<li>"stažených aplikací."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálně jste přihlášeni do následujících účtů:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Hudba"</li>\n<li>"Fotky"</li>\n<li>"Další uživatelské údaje"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"úložiště USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Chcete-li smazat také hudbu, obrázky nebo další uživatelská data, je třeba vymazat "<b>"kartu SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Smazat úložiště USB"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Nastavit a spravovat sítě VPN"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nezměněno)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(není nastaveno)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Úložiště pověření"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Použít zabezpečená pověření"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Povolit aplikacím přístup k zabezpečeným certifikátům a dalším pověřením"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Instalovat z úložiště USB"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Instalace z karty SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Nainstalovat certifikáty z úložiště USB"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Nainstalovat certifikáty z karty SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Nastavit heslo"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Nastavení nebo změna hesla úložiště pověření"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Vymazat úložiště"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Vymazat veškerý obsah úložiště pověření a resetovat heslo"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Nastavit nebo změnit heslo pro úložiště pověření"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Vymazat pověření"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Odebrat veškerý obsah a obnovit heslo"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Zadejte heslo"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Zadejte heslo úložiště pověření."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Zadejte heslo pro úložiště pověření"</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Nastavit heslo pro úložiště pověření (nejméně 8 znaků)."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuální heslo:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Nové heslo:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Potvrďte nové heslo:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Opravdu chcete smazat veškerá pověření a resetovat heslo úložiště pověření?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Veškerý obsah bude odstraněn a heslo bude obnoveno. Opravdu chcete akci provést?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Hesla se neshodují."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Heslo musí mít alespoň 8 znaků."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Zadejte správné heslo."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Zadejte prosím správné heslo. Máte ještě jeden pokus na zadání správného hesla, poté bude úložiště pověření vymazáno."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"Úložiště pověření je vymazáno."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Nesprávné heslo."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Nesprávné heslo. Zbývá vám jeden pokus, než bude úložiště pověření smazáno."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Nesprávné heslo. Počet zbývajících pokusů, než bude úložiště pověření smazáno: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Úložiště pověření je vymazáno."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Úložiště pověření je aktivováno."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tísňové vyzvánění"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastavit chování při tísňovém volání"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Připojování..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Pokračovat k dalšímu kroku"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"Zabezpečení EAP není podporováno."</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Připojení Wi-Fi EAP nelze nakonfigurovat při instalaci. Můžete to provést po dokončení instalace v nabídce Nastavení v části Bezdrátová připojení a sítě."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"V rámci úvodního nastavení nelze nakonfigurovat připojení Wi-Fi se zabezpečením EAP. Můžete to udělat později v nabídce Nastavení v části "<b>"Bezdrátová připojení a sítě"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Připojování může trvat několik minut..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Chcete-li pokračovat v nastavení, dotkněte se možnosti "<b>"Další"</b>"."\n\n"Dotkněte se možnosti "<b>"Zpět"</b>", chcete-li se připojit k jiné síti Wi-Fi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Natavení synchronizace"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Nastaly potíže se synchronizací. Služba bude brzy obnovena."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Přidat účet"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Synchronizace této položky je aktuálně deaktivována. Chcete-li předvolbu změnit, dočasně zapněte přenos dat na pozadí a automatickou synchronizaci."</string>
     <string name="enter_password" msgid="3268224850821675915">"Chcete-li obsah úložiště dešifrovat, zadejte heslo."</string>
     <string name="try_again" msgid="5904121494468643129">"Zkuste to prosím znovu"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Služba je zaneprázdněna, zkuste to znovu"</string>
 </resources>
diff --git a/res/values-da-nokeys/strings.xml b/res/values-da-nokeys/strings.xml
index f65be78..115916a3 100644
--- a/res/values-da-nokeys/strings.xml
+++ b/res/values-da-nokeys/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"Administ. programmer"</string>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Programadministration"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index dc67298..0713ef5 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -266,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låsning af SIM-kort og oplysningslagring"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angiv Min placering, oplåsning af skærmen, oplysningslagring"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Adgangskoder"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering af en enhed"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Krypter data på enhed"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Krypter data på enhed"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Kræver, at du angiver en pinkode til oplåsning eller en adgangskode"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Kræver, at du angiver en pinkode til oplåsning eller en adgangskode"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krypteret"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Du kan kryptere dine konti, indstillinger, downloadede applikationer og deres data, medier og andre filer. Når du krypterer din telefon, kan du kun dekryptere den ved at udføre en nulstilling af fabriksdata. Derved slettes alle dataene på din telefon."\n\n"Krypteringen tager op til én time. Du skal starte med et opladt batteri og sørge for, at din telefon forbliver tilsluttet, indtil krypteringen er gennemført. Hvis du afbryder krypteringsprocessen vil du miste dine data delvist eller helt."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Du kan kryptere dine konti, indstillinger, downloadede applikationer og deres data, medier og andre filer. Når du krypterer din telefon, kan du kun dekryptere den ved at udføre en nulstilling af fabriksdata. Derved slettes alle dataene på din telefon."\n\n"Krypteringen tager op til én time. Du skal starte med et opladt batteri og sørge for, at din telefon forbliver tilsluttet, indtil krypteringen er gennemført. Hvis du afbryder krypteringsprocessen vil du miste dine data delvist eller helt."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krypter tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krypter telefon"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Bekræft kryptering"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Vil du kryptere brugerdataene? Denne handling kan ikke laves om og må ikke afbrydes uden tab af data til følge. Krypteringen kan tage op til én time."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Vil du kryptere brugerdataene? Denne handling kan ikke laves om og må ikke afbrydes uden tab af data til følge. Krypteringen kan tage op til én time."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Kryptering"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Prøv igen om ^1 sekunder."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Konfigurer skærmlås"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Konfigurer skærmlås"</string>
@@ -661,8 +658,8 @@
     <string name="internal_memory" msgid="9129595691484260784">"Internt lager"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-lager"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kort"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Ledig plads"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Plads i alt"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Tilgængelig"</string>
+    <string name="memory_size" msgid="5458889090691922288">"I alt"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Beregner..."</string>
     <string name="memory_apps_usage" msgid="9079237985722858506">"Applikationer"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medier"</string>
@@ -732,8 +729,8 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Gendannelse af fabriksdata"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Sletter alle data på tabletcomputeren"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Sletter alle data på telefonen"</string>
-    <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Dette sletter alle data fra tablettens "<b>"interne lager"</b>", bl.a.:"\n\n<li>"din Google-konto"</li>\n<li>"system- og programdata og -indstillinger"</li>\n<li>"downloadede programmer"</li></string>
-    <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Dette sletter alle data fra telefonens "<b>"interne lager"</b>", bl.a.:"\n\n<li>"din Google-konto"</li>\n<li>"system- og programdata og -indstillinger"</li>\n<li>"downloadede programmer"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Dette sletter alle data fra tablettens "<b>"interne lager"</b>", bl.a.:"\n\n<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og programmer"</li>\n<li>"downloadede programmer"</li></string>
+    <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Dette sletter alle data fra telefonens "<b>"interne lager"</b>", bl.a.:"\n\n<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og programmer"</li>\n<li>"downloadede programmer"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er i øjeblikket logget ind på disse konti:"\n</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Billeder"</li>\n<li>"Andre brugerdata"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Ryd også musik, billeder og andre brugerdata ved også at slette "<b>"USB-lager"</b>"."</string>
@@ -850,7 +847,7 @@
     <string name="lockpattern_need_to_unlock_wrong" msgid="5629093548611791080">"Beklager! Prøv igen:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Tegn et oplåsningsmønster"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tryk på Menu for at få hjælp."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Slip fingeren, når du er færdig."</string>
+    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Slip med fingeren, når du er færdig."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Forbind mindst <xliff:g id="NUMBER">%d</xliff:g> punkter. Prøv igen:"</string>
     <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Mønstret blev registreret!"</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Tegn mønstret igen for at bekræfte:"</string>
@@ -875,7 +872,7 @@
     <string name="lock_title" product="default" msgid="4059246467204273930">"Beskyt din telefon"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Beskyt din tablet mod uautoriseret brug ved at oprette et personligt mønster til at låse skærmen op. Brug din finger til at forbinde punkterne vilkårligt på det næste skærmbillede. Du skal forbinde mindst fire punkter."\n\n"Klar til at starte? Tryk på \"Næste\"."</string>
     <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Beskyt din telefon mod uautoriseret brug ved at oprette et personligt mønster til at låse skærmen op. "\n<font height="17">\n</font><b>"1"</b>"  På næste skærm kan du se et eksempel på, hvordan mønsteret tegnes. "\n<font height="17">\n</font><b>"2"</b>"  Når du er klar, kan du tegne dit eget personlige mønster til at låse op. Eksperimenter med forskellige mønstre, men forbind mindst fire punkter. "\n<font height="17">\n</font><b>"3"</b>"  Tegn dit mønster igen for at bekræfte. "\n<font height="17">\n</font><b>"Er du klar? Tryk på \"Næste\""</b>". "\n<font height="3">\n</font>"Du kan lade din telefon være ubeskyttet ved at trykke på \"Annuller\"."</font></string>
-    <string name="manageapplications_settings_title" msgid="5712405848153426706">"Administ. programmer"</string>
+    <string name="manageapplications_settings_title" msgid="5712405848153426706">"Programadministration"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Administrer og fjern installerede programmer"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Programmer"</string>
     <string name="applications_settings_summary" msgid="2714215108369119717">"Administ. programmer, konf. genveje til hurtig start"</string>
@@ -915,7 +912,7 @@
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Vælg indstillinger for filtret"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
-    <string name="filter_apps_third_party" msgid="7786348047690140979">"Overført"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Downloads"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Kørende"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lager"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På SD-kort"</string>
@@ -1319,7 +1316,7 @@
     <string name="privacy_settings_title" msgid="1987089301293213705">"Indstillinger for fortrolighed"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Sikkerhedskopiering og gendannelse"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personlige oplysninger"</string>
-    <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhedskopier mine data"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhedskopier data"</string>
     <string name="backup_data_summary" msgid="6515285107793232815">"Sikkerhedskopier programdata, Wi-Fi-adgangskoder og andre indstillinger på Googles servere"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Sikkerhedskonto"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Der er ingen konto, der i øjeblikket lagrer sikkerhedskopierede data"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d95fa8c..75b163b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -87,7 +87,7 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Leer"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Überspannung"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Unbekannter Fehler"</string>
-    <string name="battery_info_health_cold" msgid="3835692786176707318">"kalt"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Kalt"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Sichtbar"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Für <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> Sekunden sichtbar..."</string>
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth-Pairing-Anfrage"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pairing-Anfrage"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Zum Pairing auswählen: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Erhaltene Dateien anzeigen"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Liste der über Bluetooth empfang. Dateien anzeigen"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth-Geräteauswahl"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-Berechtigungsanfrage"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Eine Anwendung beantragt eine Berechtigung zum Aktivieren von Bluetooth. Möchten Sie dies tun?"</string>
@@ -125,7 +123,7 @@
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Eine Anwendung auf Ihrem Telefon beantragt die Berechtigung, Bluetooth zu aktivieren und Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Telefone sichtbar zu machen. Möchten Sie dies tun?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Bluetooth wird aktiviert..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automatische Verbindung"</string>
-    <string name="date_and_time" msgid="4114084177056654663">"Einstellungen für Datum &amp;amp Uhrzeit"</string>
+    <string name="date_and_time" msgid="4114084177056654663">"Einstellungen für Datum &amp; Uhrzeit"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Zeitzone auswählen"</string>
@@ -221,7 +219,7 @@
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-Einstellungen"</string>
     <string name="cancel" msgid="6859253417269739139">"Abbrechen"</string>
     <string name="settings_label" msgid="1626402585530130914">"Einstellungen"</string>
-    <string name="settings_label_launcher" msgid="8344735489639482340">"Ein- stellungen"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Einstellung."</string>
     <string name="settings_shortcut" msgid="8597387747077828217">"Einstellungsverknüpfung auswählen"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flugmodus"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Alle drahtlosen Verbindungen deaktivieren"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Netzbetreiberauswahl"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Netzbetreiber auswählen"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum &amp; Uhrzeit"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Datum und Uhrzeit einstellen"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Datum und Uhrzeit einstellen"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Datum, Uhrzeit, Zeitzone und Formate festlegen"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Automatisches Datum &amp; Uhrzeit"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Vom Netzwerk angegebene Zeitzone verwenden"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Meinen Standort, Display-Entsperrung, SIM-Kartensperre und Sperre für Anmeldeinformationsspeicher festlegen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Meinen Standort, Display-Entsperrung, SIM-Kartensperrung und Sperrung des Anmeldeinformationsspeichers festlegen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwörter"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Geräteverschlüsselung"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Daten auf Gerät verschlüsseln"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Daten auf Gerät verschlüsseln"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Erfordert das Festlegen einer PIN bzw. eines Passworts zur Geräteentsperrung"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Erfordert das Festlegen einer PIN bzw. eines Passworts zur Geräteentsperrung"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Verschlüsselt"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Anwendungen und die entsprechenden Daten, Medien und sonstigen Dateien verschlüsseln. Nach einer Verschlüsselung Ihres Telefons können Sie es nur noch mittels Zurücksetzen auf die Werkseinstellungen entschlüsseln, wobei alle auf ihm befindlichen Daten gelöscht werden."\n\n"Die Verschlüsselung kann bis zu einer Stunde dauern. Der Akku muss beim Start des Vorgangs aufgeladen sein und das Telefon muss eingesteckt bleiben, bis er abgeschlossen ist. Sollten Sie den Verschlüsselungsvorgang unterbrechen, gehen einige oder alle Daten verloren."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Anwendungen und die entsprechenden Daten, Medien und sonstigen Dateien verschlüsseln. Nach einer Verschlüsselung Ihres Telefons können Sie es nur noch mittels Zurücksetzen auf die Werkseinstellungen entschlüsseln, wobei alle auf ihm befindlichen Daten gelöscht werden."\n\n"Die Verschlüsselung kann bis zu einer Stunde dauern. Der Akku muss beim Start des Vorgangs aufgeladen sein und das Telefon muss eingesteckt bleiben, bis er abgeschlossen ist. Sollten Sie den Verschlüsselungsvorgang unterbrechen, gehen einige oder alle Daten verloren."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tablet verschlüsseln"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefon verschlüsseln"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Verschlüsselung bestätigen"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Nutzerdaten verschlüsseln? Dieser Vorgang ist nicht umkehrbar und jede Unterbrechung ist mit einem Datenverlust verbunden! Die Verschlüsselung kann bis zu einer Stunde dauern."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Nutzerdaten verschlüsseln? Dieser Vorgang ist nicht umkehrbar und jede Unterbrechung ist mit einem Datenverlust verbunden! Die Verschlüsselung kann bis zu einer Stunde dauern."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Verschlüsselung"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"In ^1 Sekunden erneut versuchen"</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Sperrbildschirm konfig"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Bildschirmsperre konf."</string>
@@ -372,7 +367,7 @@
   </plurals>
     <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Geräteadministrator lässt die Verwendung eines früheren Passworts nicht zu"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
-    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Abbrechen"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Abbruch"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Abbrechen"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Weiter"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Geräteverwaltung"</string>
@@ -384,7 +379,7 @@
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth-Einstellungen"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Verbindungen, Gerätenamen und Erkennbarkeit verwalten"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth-Pairing-Anfrage"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"PIN zum Pairing mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" eingeben. (Versuchen Sie es mit 0000 oder 1234.) Möglicherweise müssen Sie dieselbe PIN auf dem Bluetooth-Gerät eingeben."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"PIN zum Pairing mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" eingeben. Versuchen Sie es mit 0000 oder 1234. Möglicherweise müssen Sie dieselbe PIN auf dem Bluetooth-Gerät eingeben."</string>
     <string name="bluetooth_enter_passkey_msg" msgid="8301499416158195044">\n"Schlüssel zum Pairing mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" eingeben"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Bestätigen Sie zum Paaren mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", dass es den folgenden Schlüssel anzeigt: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"möchte sich paaren."</string>
@@ -554,7 +549,7 @@
     <string name="media_volume_title" msgid="3576565767317118106">"Medien"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Lautstärke für Musik und Videos festlegen"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Wecker"</string>
-    <string name="dock_settings_summary" msgid="455802113668982481">"Audioeinstellungen für angeschlossenen Dock"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"Audioeinstellungen für angeschlossenes Dock"</string>
     <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Tastentöne"</string>
     <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Töne bei Telefonwahl"</string>
     <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Töne bei Telefonwahl"</string>
@@ -572,11 +567,11 @@
     <string name="dock_settings" msgid="1820107306693002541">"Dock"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Dock-Einstellungen"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
-    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Einstellungen für angeschlossenen Desktop-Dock"</string>
-    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Einstellungen für angeschlossenen Kfz-Dock"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Einstellungen für angeschlossenes Desktop-Dock"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Einstellungen für angeschlossenes Kfz-Dock"</string>
     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet nicht angedockt"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon nicht angedockt"</string>
-    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Einstellungen für angeschlossenen Dock"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Einstellungen für angeschlossenes Dock"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dock nicht gefunden"</string>
     <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Zur Konfiguration des Dock-Audios muss das Tablet angedockt sein."</string>
     <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Zur Konfiguration des Dock-Audios muss das Telefon angedockt sein."</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Speichereinstellungen"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB-Speicher trennen, verfügbaren Speicher anzeigen"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD-Karte entnehmen, verfügbaren Speicher anzeigen"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Meine Telefonnummer"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Meine Telefonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL-Version"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Interner Speicher"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-Speicher"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-Karte"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Verfügbarer Speicher"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Gesamtspeicher"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Verfügbar"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Gesamt"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Berechnen…"</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Anwendungsnutzung"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Mediennutzung"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Anwendungen"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Medien"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Freig. Speicher trennen"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-Karte entnehmen"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Internen USB-Speicher trennen"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Tablet-Geräts gelöscht, u. a."\n\n<li>"Ihr Google-Konto,"</li>\n<li>"die System- und Anwendungsdaten und -einstellungen"</li>\n<li>"und heruntergeladene Anwendungen"</li>"."</string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Telefons gelöscht, u. a."\n\n<li>"Ihr Google-Konto,"</li>\n<li>"die System- und Anwendungsdaten und -einstellungen"</li>\n<li>"und heruntergeladene Anwendungen"</li>"."</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Sie sind derzeit in folgenden Konten angemeldet:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Fotos"</li>\n<li>"Sonstige Nutzerdaten"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss der "<b>"USB-Speicher"</b>" geleert werden."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Damit auch Musik, Bilder und andere Nutzerdaten gelöscht werden können, muss die "<b>"SD-Karte"</b>" gelöscht werden."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB-Speicher löschen"</string>
@@ -997,8 +991,8 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Systemdienst beenden?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Möchten Sie diesen Systemdienst wirklich beenden? Möglicherweise funktionieren dann einige Funktionen Ihres Tablets nicht mehr richtig, bis Sie es aus- und wieder einschalten."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Möchten Sie diesen Systemdienst wirklich beenden? Möglicherweise funktionieren dann einige Funktionen Ihres Telefons nicht mehr richtig, bis Sie es aus- und wieder einschalten."</string>
-    <string name="language_settings" msgid="5292716747264442359">"Sprache und Eingabe"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Sprache und Eingabe"</string>
+    <string name="language_settings" msgid="5292716747264442359">"Sprache &amp; Eingabe"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Sprache &amp; Eingabe"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Spracheinstellungen"</string>
     <string name="keyboard_settings_category" msgid="7060453865544070642">"Tastatureinstellungen"</string>
     <string name="phone_language" msgid="1165758957501090679">"Sprache auswählen"</string>
@@ -1040,7 +1034,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Texteingabe"</string>
     <string name="input_method" msgid="5434026103176856164">"Eingabemethode"</string>
     <string name="current_input_method" msgid="2146807723398303917">"Aktuelle Eingabemethode"</string>
-    <string name="input_method_selector" msgid="4311213129681430709">"Eingabemethoden-Auswahl"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Auswahl der Eingabemethoden"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatisch"</string>
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Immer anzeigen"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Immer ausblenden"</string>
@@ -1076,7 +1070,7 @@
     <string name="launch_count_label" msgid="4019444833263957024">"Anzahl"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Nutzungszeit"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Eingabehilfen"</string>
-    <string name="accessibility_settings_title" msgid="2130492524656204459">"Einstellungen für Eingabehilfe"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Einstellungen für Eingabehilfen"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Optionen für Eingabehilfe verwalten"</string>
     <string name="toggle_accessibility_title" msgid="650839277066574497">"Eingabehilfen"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Eingabehilfendienste"</string>
@@ -1291,38 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Virtual Private Networks (VPNs) einrichten und verwalten"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nicht geändert)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nicht festgelegt)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Anmeldedatenspeicher"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Sichere Anmeldeinfos"</string>
-    <!-- unknown quoting pattern: original -1, translation 1 -->
-    <string name="credentials_access_summary" msgid="319662078718574168">"Anwendungen können sichere Zertifikate &amp;amp; Anmeldeinform. abrufen"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_access_summary" msgid="319662078718574168">"Anwendungen können sichere Zertifikate und Anmeldeinformationen abrufen"</string>
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Von USB-Speicher installieren"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Von SD-Karte installieren"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Zertifikate von USB-Speicher installieren"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Zertifikate von SD-Karte installieren"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Passwort festlegen"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Passwort für Anmeldeinformationsspeicher festlegen oder ändern"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Speicherinhalt löschen"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Inhalt des Anmeldeinformationsspeichers löschen und Passwort zurücksetzen"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Passwort für Anmeldedatenspeicher festlegen oder ändern"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Anmeldedaten löschen"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Sämtliche Inhalte entfernen und Passwort zurücksetzen"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Passwort eingeben"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Geben Sie das Passwort für den Anmeldeinformationsspeicher ein."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Geben Sie das Passwort für den Anmeldedatenspeicher ein."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Legen Sie das Passwort für den Anmeldedatenspeicher fest. Dieses muss mindestens acht Zeichen lang sein."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuelles Passwort:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Neues Passwort:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Neues Passwort bestätigen:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Möchten Sie wirklich alle Anmeldeinformationen löschen und das Passwort für den Anmeldeinformationsspeicher zurücksetzen?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Sämtliche Inhalte werden gelöscht und das Passwort wird zurückgesetzt. Möchten Sie wirklich fortfahren?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Die Passwörter stimmen nicht überein."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Das Passwort muss mindestens acht Zeichen lang sein."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Geben Sie das richtige Passwort ein."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Geben Sie das richtige Passwort ein. Sie haben noch einen Versuch, das richtige Passwort einzugeben. Anschließend wird der Anmeldeinformationsspeicher gelöscht."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"Der Speicher für die Anmeldeinformationen wurde gelöscht."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Falsches Passwort"</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Falsches Passwort. Sie haben noch einen Versuch, bevor Ihr Anmeldedatenspeicher gelöscht wird."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Falsches Passwort. Sie haben noch <xliff:g id="NUMBER">%1$d</xliff:g> Versuche, bevor Ihr Anmeldedatenspeicher gelöscht wird."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Speicher wurde gelöscht."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Der Anmeldeinformationsspeicher ist aktiviert."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Notfallsignal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Verhalten bei einem Notruf festlegen"</string>
@@ -1354,7 +1340,7 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Benachrichtigungen"</string>
     <string name="sound_category_feedback_title" msgid="4399742321363475393">"Feedback"</string>
     <string name="wifi_setup_title" msgid="661074868726906436">"WLAN-Einrichtung"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Mit WLAN-Netzwerk verbinden :<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Mit WLAN-Netzwerk verbinden: <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Verbindung mit WLAN-Netzwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
     <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Mit WLAN-Netzwerk <xliff:g id="NETWORK_NAME">%s</xliff:g> verbunden"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Netzwerk hinzufügen"</string>
@@ -1378,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Verbindung wird hergestellt..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Weiter zum nächsten Schritt"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP nicht unterstützt"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Während des Setups können Sie keine EAP-WLAN-Verbindung konfigurieren. Sie können dies nach dem Setup in den Einstellungen unter \"Drahtlos und Netzwerke\" vornehmen."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Während der Einrichtung können Sie keine EAP-WLAN-Verbindung konfigurieren. Sie können dies anschließend in den Einstellungen unter "<b>"Drahtlos und Netzwerke"</b>" tun."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Der Verbindungsaufbau kann einige Minuten dauern..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Tippen Sie auf "<b>"Weiter"</b>", um mit der Einrichtung fortzufahren."\n\n"Tippen Sie auf "<b>"Zurück"</b>", um eine Verbindung zu einem anderen WLAN-Netzwerk herzustellen."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Synchronisierungseinstellungen"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Bei der Synchronisierung treten derzeit Probleme auf. Sie wird in Kürze fortgesetzt."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Konto hinzufügen"</string>
@@ -1425,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Die Synchronisierung ist für dieses Element zurzeit deaktiviert. Zur Änderung Ihrer Voreinstellungen aktivieren Sie vorübergehend Hintergrunddaten und automatische Synchronisierung."</string>
     <string name="enter_password" msgid="3268224850821675915">"Passwort zum Entschlüsseln des Speichers eingeben"</string>
     <string name="try_again" msgid="5904121494468643129">"Tut uns leid. Versuchen Sie es noch einmal."</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Dienst nicht verfügbar. Bitte versuchen Sie es erneut."</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index baf7586..5908b68 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -266,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ορισμός του \"Η τοποθεσία μου\", του ξεκλειδώματος οθόνης και του κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Κωδικοί πρόσβασης"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Κρυπτογράφηση συσκευής"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Κρυπτογράφηση δεδομένων στη συσκευή"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Κρυπτογράφηση δεδομένων στη συσκευή"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Απαιτεί να ορίσετε έναν αριθμό PIN ή κωδικό ξεκλειδώματος συσκευής"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Απαιτεί να ορίσετε έναν αριθμό PIN ή κωδικό ξεκλειδώματος συσκευής"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Κρυπτογραφημένο"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις ληφθείσες εφαρμογές σας και τα δεδομένα τους, τα πολυμέσα και άλλα αρχεία. Από τη στιγμή που θα κρυπτογραφήσετε το τηλέφωνό σας, δεν μπορείτε να αναιρέσετε αυτήν την ενέργεια πάρα μόνο εάν εκτελέσετε επαναφορά εργοστασιακών ρυθμίσεων, διαγράφοντας έτσι όλα τα δεδομένα που υπάρχουν στο τηλέφωνό σας."\n\n"Η κρυπτογράφηση διαρκεί έως και μία ώρα. Θα πρέπει να ξεκινήσετε τη διαδικασία με φορτισμένη μπαταρία και να διατηρήσετε το τηλέφωνο συνδεδεμένο με την παροχή ρεύματος μέχρι να ολοκληρωθεί η κρυπτογράφηση. Σε περίπτωση που διακόψετε τη διαδικασία κρυπτογράφησης, θα χάσετε μέρος ή το σύνολο των δεδομένων σας."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις ληφθείσες εφαρμογές σας και τα δεδομένα τους, τα πολυμέσα και άλλα αρχεία. Από τη στιγμή που θα κρυπτογραφήσετε το τηλέφωνό σας, δεν μπορείτε να αναιρέσετε αυτήν την ενέργεια πάρα μόνο εάν εκτελέσετε επαναφορά εργοστασιακών ρυθμίσεων, διαγράφοντας έτσι όλα τα δεδομένα που υπάρχουν στο τηλέφωνό σας."\n\n"Η κρυπτογράφηση διαρκεί έως και μία ώρα. Θα πρέπει να ξεκινήσετε τη διαδικασία με φορτισμένη μπαταρία και να διατηρήσετε το τηλέφωνο συνδεδεμένο με την παροχή ρεύματος μέχρι να ολοκληρωθεί η κρυπτογράφηση. Σε περίπτωση που διακόψετε τη διαδικασία κρυπτογράφησης, θα χάσετε μέρος ή το σύνολο των δεδομένων σας."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Κρυπτογράφηση tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Κρυπτογράφηση τηλεφώνου"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Επιβεβαίωση κρυπτογράφησης"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Να γίνει κρυπτογράφηση των δεδομένων του χρήστη; Αυτή η λειτουργία δεν είναι αναστρέψιμη και υπάρχει κίνδυνος απώλειας δεδομένων σε περίπτωση διακοπής της! Η κρυπτογράφηση ενδέχεται να διαρκέσει έως και μία ώρα."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Να γίνει κρυπτογράφηση των δεδομένων του χρήστη; Αυτή η λειτουργία δεν είναι αναστρέψιμη και υπάρχει κίνδυνος απώλειας δεδομένων σε περίπτωση διακοπής της! Η κρυπτογράφηση ενδέχεται να διαρκέσει έως και μία ώρα."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Κρυπτογράφηση"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Προσπαθήστε ξανά σε ^1 δευτερόλεπτα."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Διαμ. οθόνης κλειδ."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Διαμόρ. οθόνης κλειδ."</string>
@@ -661,8 +658,8 @@
     <string name="internal_memory" msgid="9129595691484260784">"Εσωτερικός αποθηκευτικός χώρος"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Αποθ. χώρος USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Κάρτα SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Διαθέσιμος χώρος"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Συνολικός χώρος"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Διαθέσιμο"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Σύνολο"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Υπολογισμός..."</string>
     <string name="memory_apps_usage" msgid="9079237985722858506">"Εφαρμογές"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Μέσα"</string>
@@ -994,8 +991,8 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Διακοπή υπηρεσίας συστήματος;"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Είστε ακόμα σίγουροι ότι θέλετε να διακόψετε αυτή την υπηρεσία συστήματος; Αν ναι, κάποιες λειτουργίες του tablet σας ενδέχεται να σταματήσουν να λειτουργούν σωστά μέχρι να το απενεργοποιήσετε και να το ενεργοποιήσετε ξανά."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Είστε ακόμα σίγουροι ότι θέλετε να διακόψετε αυτή την υπηρεσία συστήματος; Αν ναι, κάποιες λειτουργίες του τηλεφώνου σας ενδέχεται να σταματήσουν να λειτουργούν σωστά μέχρι να απενεργοποιήσετε και να ενεργοποιήσετε ξανά την υπηρεσία."</string>
-    <string name="language_settings" msgid="5292716747264442359">"Γλώσσα &amp; εισαγωγή"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Γλώσσα &amp; εισαγωγή"</string>
+    <string name="language_settings" msgid="5292716747264442359">"Γλώσσα και εισαγωγή"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Γλώσσα και εισαγωγή"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Ρυθμίσεις γλώσσας"</string>
     <string name="keyboard_settings_category" msgid="7060453865544070642">"Ρυθμίσεις πληκτρολογίου"</string>
     <string name="phone_language" msgid="1165758957501090679">"Επιλογή γλώσσας"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 18fc7f7..8dd24c4 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -266,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwords"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Device encryption"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encrypt data on device"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encrypt data on device"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Requires you to set a device unlock pin or password"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Requires you to set a device unlock pin or password"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encrypted"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"You can encrypt your accounts, settings, downloaded applications and their data, media and other files. Once you encrypt your phone, you can\'t unencrypt it except by performing a factory data reset, erasing all the data on your phone."\n\n"Encryption takes up to an hour. You must start with a charged battery and keep your phone plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"You can encrypt your accounts, settings, downloaded applications and their data, media and other files. Once you encrypt your phone, you can\'t unencrypt it except by performing a factory data reset, erasing all the data on your phone."\n\n"Encryption takes up to an hour. You must start with a charged battery and keep your phone plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encrypt tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encrypt phone"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirm encryption"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Encrypt user data? This operation is not reversible and may not be interrupted without loss of data! Encryption may take up to an hour."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Encrypt user data? This operation is not reversible and may not be interrupted without loss of data! Encryption may take up to an hour."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encrypting"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Try again in ^1 seconds."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Configure lock screen"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Configure lock screen"</string>
@@ -469,7 +466,7 @@
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Enter pin from access point"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS Setup"</string>
     <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Enter the pin <xliff:g id="WPS_PIN">%1$s</xliff:g> on the access point"</string>
-    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS is already in progress and can take tens of seconds to complete"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS is already in progress and can take some time to complete"</string>
     <string name="wifi_wps_failed" msgid="2277409652621482331">"Failed to start WPS. Please try again"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Network SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Security"</string>
@@ -499,7 +496,7 @@
     <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Save"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancel"</string>
-    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Another WPS session detected. Please retry in a few minutes"</string>
+    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Another WPS session detected. Please retry in a few minutes."</string>
     <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Advanced"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi frequency band"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Specify the frequency range of operation"</string>
@@ -661,8 +658,8 @@
     <string name="internal_memory" msgid="9129595691484260784">"Internal storage"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB storage"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD card"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Available space"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Total space"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Available"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculating..."</string>
     <string name="memory_apps_usage" msgid="9079237985722858506">"Applications"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 728413e..9088546 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -266,29 +266,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de la tarjeta SIM, bloqueo de almacenamiento de la credencial"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de almacenamiento de credencial"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
-    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación del dispositivo"</string>
-    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar datos en el dispositivo"</string>
-    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar datos en el dispositivo"</string>
-    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Debes configurar un número de PIN o contraseña para desbloquear el dispositivo"</string>
-    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Debes configurar un número de PIN o contraseña para desbloquear el dispositivo"</string>
+    <!-- outdated translation 3855024169931601690 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación del dispositivo"</string>
+    <!-- outdated translation 824181954831066710 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar datos en el dispositivo"</string>
+    <!-- outdated translation 824181954831066710 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar datos en el dispositivo"</string>
+    <!-- outdated translation 8654848918081244133 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Debes configurar un número de PIN o contraseña para desbloquear el dispositivo"</string>
+    <!-- outdated translation 8654848918081244133 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Debes configurar un número de PIN o contraseña para desbloquear el dispositivo"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
-    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Puedes encriptar tus cuentas, configuraciones, aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Una vez que encriptas tu teléfono, no puedes descifrarlo a menos que restablezcas la configuración de fábrica, borrando todos los datos de tu teléfono."\n\n"La encriptación demora hasta una hora. Debes comenzar con una batería cargada y mantener tu teléfono enchufado hasta que se complete la encriptación. Si interrumpes el proceso de encriptación, perderás parte de o todos tus datos."</string>
-    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Puedes encriptar tus cuentas, configuraciones, aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Una vez que encriptas tu teléfono, no puedes descifrarlo a menos que restablezcas la configuración de fábrica, borrando todos los datos de tu teléfono."\n\n"La encriptación demora hasta una hora. Debes comenzar con una batería cargada y mantener tu teléfono enchufado hasta que se complete la encriptación. Si interrumpes el proceso de encriptación, perderás parte de o todos tus datos."</string>
+    <!-- outdated translation 9127899943273969221 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Puedes encriptar tus cuentas, tus configuraciones, tus aplicaciones descargadas y sus datos, tus medios, y otros archivos. Una vez que encriptas tu teléfono, no puedes desencriptarlo a menos que restablezcas la configuración de fábrica, borrando todos los datos de tu teléfono. "\n\n"La encriptación lleva hasta una hora. Debes comenzar con la batería cargada y mantener tu teléfono conectado hasta que finalice la encriptación. Si interrumpes el proceso, perderás algunos o todos tus datos."</string>
+    <!-- outdated translation 9127899943273969221 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Puedes encriptar tus cuentas, tus configuraciones, tus aplicaciones descargadas y sus datos, tus medios, y otros archivos. Una vez que encriptas tu teléfono, no puedes desencriptarlo a menos que restablezcas la configuración de fábrica, borrando todos los datos de tu teléfono. "\n\n"La encriptación lleva hasta una hora. Debes comenzar con la batería cargada y mantener tu teléfono conectado hasta que finalice la encriptación. Si interrumpes el proceso, perderás algunos o todos tus datos."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tableta"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar teléfono"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
+    <skip />
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmar encriptación"</string>
-    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"¿Deseas encriptar los datos del usuario? ¡No podrás volver atrás esta operación y puede que no se interrumpa sin pérdida de datos! La encriptación puede demorar hasta una hora."</string>
-    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"¿Deseas encriptar los datos del usuario? ¡No podrás volver atrás esta operación y puede que no se interrumpa sin pérdida de datos! La encriptación puede demorar hasta una hora."</string>
+    <!-- outdated translation 5952712462271194618 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"¿Deseas encriptar los datos del usuario? ¡No podrás volver atrás esta operación y puede que no se interrumpa sin pérdida de datos! La encriptación puede demorar hasta una hora."</string>
+    <!-- outdated translation 5952712462271194618 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"¿Deseas encriptar los datos del usuario? ¡No podrás volver atrás esta operación y puede que no se interrumpa sin pérdida de datos! La encriptación puede demorar hasta una hora."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encriptando"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Vuelve a intentarlo en ^segundos."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
+    <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Configurar el bloqueo de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Configurar el bloqueo de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Cambiar bloqueo de la pantalla"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a0352c4..570d7b9 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitud de sincronización de Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitud de sincronización"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Seleccionar <xliff:g id="DEVICE_NAME">%1$s</xliff:g> para realizar la sincronización"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Mostrar archivos recibidos"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Mostrar lista de archivos recibidos por Bluetooth"</string>
     <string name="device_picker" msgid="8721012448931226323">"Selector del dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitud de permiso de Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Una aplicación está solicitando permiso para activar la función Bluetooth. ¿Aceptas?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Selección de operador"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Seleccionar un operador de red"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Fecha y hora"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Establecer fecha y hora"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Establecer fecha y hora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Establecer fecha, hora, zona horaria y formatos"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Fecha y hora automáticas"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Usar hora proporcionada por la red"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, bloqueo de pantalla, bloqueo de tarjeta SIM y bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer ubicación, bloqueo de pantalla y bloqueo de almacenamiento de credenciales"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación del dispositivo"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar datos del dispositivo"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar datos del dispositivo"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Requiere que el usuario establezca una contraseña o un PIN de desbloqueo para el dispositivo."</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Requiere que el usuario establezca una contraseña o un PIN de desbloqueo para el dispositivo."</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Puedes encriptar tus cuentas, tus ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Una vez que hayas encriptado el teléfono, solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del teléfono."\n\n"El proceso de encriptación tarda una hora. Debes iniciar este proceso con una batería cargada y mantener el teléfono conectado hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Puedes encriptar tus cuentas, tus ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Una vez que hayas encriptado el teléfono, solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del teléfono."\n\n"El proceso de encriptación tarda una hora. Debes iniciar este proceso con una batería cargada y mantener el teléfono conectado hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tableta"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar teléfono"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmar encriptación"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"¿Deseas iniciar la encriptación de datos de usuario? Este proceso puede tardar un máximo de una hora. Ten en cuenta que esta operación no se puede deshacer y que, si se interrumpe, se perderán datos."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"¿Deseas iniciar la encriptación de datos de usuario? Este proceso puede tardar un máximo de una hora. Ten en cuenta que esta operación no se puede deshacer y que, si se interrumpe, se perderán datos."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encriptando"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Espera ^1 segundos y vuelve a intentarlo."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Configurar bloqueo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Configurar bloqueo"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Ajustes de almacenamiento"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Desactivar almacenamiento USB, ver almacenamiento disponible"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Desactivar tarjeta SD, ver almacenamiento disponible."</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Mi número de teléfono"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Mi número de teléfono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versión de PRL"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Almacenamiento interno"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Almacenamiento USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Tarjeta SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Espacio disponible"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Espacio total"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Disponible"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Uso de la aplicación"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Uso de medios"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplicaciones"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Multimedia"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desactivar almacenam comp"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desactivar tarjeta SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desactivar almacenamiento USB interno"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Se borrará toda la información del "<b>"almacenamiento interno"</b>" de la tableta, incluidos:"\n\n<li>"los datos de tu cuenta de Google,"</li>\n<li>"los datos de configuración e información de aplicaciones y del sistema,"</li>\n<li>"los datos de aplicaciones descargadas"</li>"."</string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Se borrará toda la información del "<b>"almacenamiento interno"</b>" del teléfono, incluidos:"\n\n<li>"los datos de tu cuenta de Google,"</li>\n<li>"los datos de configuración e información de aplicaciones y del sistema,"</li>\n<li>"los datos de aplicaciones descargadas"</li>"."</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Has accedido a las cuentas que se indican a continuación:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Si también quieres borrar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Si también quieres borrar la música, las imágenes y otros datos de usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Borrar almacenamiento USB"</string>
@@ -1005,7 +999,7 @@
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Corrección automática"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Corregir palabras con errores de escritura"</string>
-    <string name="auto_caps" msgid="6379232078052591265">"Uso automát de mayúsculas"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Mayúsculas automáticas"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Escribir en mayúsculas la primera letra de las frases"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Puntuación automática"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Ajustes del teclado físico"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Configurar y administrar redes privadas virtuales (VPN)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(sin modificar)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(sin definir)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Almacenamiento de credenciales"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Credenciales seguras"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Permitir que las aplicaciones accedan a los certificados seguros y a otras credenciales"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Instalar desde USB"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Instalar desde la tarjeta SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Instalar certificados desde almacenamiento USB"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalar certificados desde la tarjeta SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Establecer contraseña"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Establecer o cambiar la contraseña de almacenamiento de credenciales"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Borrar almacenamiento"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Borrar almacenamiento de credenciales de todo el contenido y restablecer su contraseña"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Establecer o cambiar la contraseña del almacenamiento de credenciales"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Borrar credenciales"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Eliminar todo el contenido y restablecer la contraseña"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Introducir contraseña"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introduce la contraseña de almacenamiento de credenciales."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introduce la contraseña del almacenamiento de credenciales."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Establece la contraseña del almacenamiento de credenciales (debe tener un mínimo de 8 caracteres)."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contraseña actual:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Contraseña nueva:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmar contraseña nueva:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"¿Estás seguro de que quieres eliminar todas las credenciales y restablecer la contraseña de almacenamiento de credenciales?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Se eliminará todo el contenido y se restablecerá la contraseña. ¿Seguro que quieres continuar?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Las contraseñas no coinciden."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"La contraseña debe tener un mínimo de ocho caracteres."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Introduce la contraseña correcta."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Introduce la contraseña correcta. Dispones de un intento más para introducir la contraseña antes de que se borre el almacenamiento de credenciales."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"Se ha borrado el almacenamiento de credenciales."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Contraseña incorrecta"</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Contraseña incorrecta. Tienes una oportunidad más antes de que se borre el almacenamiento de credenciales."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Contraseña incorrecta. Tienes <xliff:g id="NUMBER">%1$d</xliff:g> oportunidades más antes de que se borre el almacenamiento de credenciales."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Almacenamiento credenciales borrado"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Almacenamiento de credenciales habilitado"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Establecer comportamiento al realizar una llamada de emergencia"</string>
@@ -1352,10 +1339,10 @@
     <string name="sound_category_calls_title" msgid="3688531959256239012">"Llamadas entrantes"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificaciones"</string>
     <string name="sound_category_feedback_title" msgid="4399742321363475393">"Respuesta del teléfono"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Configuración de WiFi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Establecer conexión con la red WiFi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Estableciendo conexión con la red WiFi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Conectado a la red WiFi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Configuración de Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Establecer conexión con la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Estableciendo conexión con la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Conectado a la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Añadir una red"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Sin conexión"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Añadir red"</string>
@@ -1369,7 +1356,7 @@
     <string name="wifi_setup_save" msgid="3659235094218508211">"Guardar"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"Cancelar"</string>
     <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Buscando redes..."</string>
-    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Toca una red para conectarte a ella"</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Toca en una red para conectarte a ella"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Establecer conexión con red existente"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Conectar con red no segura"</string>
     <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Introducir configuración de red"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Conectando..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Ir al siguiente paso"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"No se admite EAP."</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"No puedes configurar una conexión WiFi EAP durante la configuración. Después de la configuración, puedes configurarla en Ajustes, dentro de Conexiones inalámbricas y redes."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"No puedes definir una conexión Wi-Fi EAP durante la configuración, pero puedes hacerlo una vez que haya finalizado a través de Ajustes en "<b>"Configuración inalámbrica y redes"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Conectando (puede tardar unos minutos)..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Toca "<b>"Siguiente"</b>" para continuar con la configuración."\n\n"Toca "<b>"Volver"</b>" para conectarte a otra red Wi-Fi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Ajustes de sincronización"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"En este momento hay problemas con la sincronización. Se restablecerá en breve."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Añadir cuenta"</string>
@@ -1417,13 +1402,12 @@
     <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"¿Seguro que deseas eliminar esta cuenta? Si lo haces, también se eliminarán de la tableta todos los mensajes, los contactos y otros datos de la cuenta. "\n"¿Quieres continuar?"</string>
     <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"¿Deseas eliminar realmente esta cuenta? Si la eliminas, también se borrarán del teléfono todos los mensajes, los contactos y otros datos de la cuenta. "\n"¿Quieres continuar?"</string>
     <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Algunas aplicaciones necesitan esta cuenta. Solo puedes eliminarla restableciendo los valores predeterminados de fábrica de la tableta (esta acción elimina todos tus datos personales). Para ello, accede a Ajustes, Privacidad."</string>
-    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Algunas aplicaciones necesitan esta cuenta. Solo puedes eliminarla restableciendo los valores predeterminados de fábrica del teléfono (esta acción elimina todos tus datos personales). Para ello, accede a Ajustes, Privacidad."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Algunas aplicaciones necesitan esta cuenta. Solo puedes eliminarla restableciendo los valores predeterminados de fábrica del teléfono (esta acción elimina todos tus datos personales). Para ello, accede a Ajustes y, después, a Privacidad."</string>
     <string name="provider_label" msgid="7724593781904508866">"Enviar suscripciones"</string>
     <string name="sync_item_title" msgid="1931551540462877488">"Sincronizar <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="7185199796123573317">"No se puede realizar la sincronización de forma manual."</string>
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"La sincronización de este elemento no está disponible en este momento. Para modificar tu preferencia, activa temporalmente los datos de referencia y la sincronización automática."</string>
     <string name="enter_password" msgid="3268224850821675915">"Introducir contraseña para descifrar el almacenamiento"</string>
     <string name="try_again" msgid="5904121494468643129">"Inténtalo de nuevo"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Servicio VPN ocupado. Inténtalo de nuevo."</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 6c51aa7..3de37ba 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"درخواست جفت سازی"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"درخواست جفت سازی"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"انتخاب برای جفت سازی با <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"نمایش فایل های دریافتی"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"نمایش لیستی از فایل های دریافت شده از طریق بلوتوث"</string>
     <string name="device_picker" msgid="8721012448931226323">"انتخاب کننده دستگاه بلوتوث"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"درخواست مجوز بلوتوث"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"برنامه ای درخواست کرده است که بلوتوث روشن شود. می خواهید این کار را انجام دهید؟"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"انتخاب اپراتور"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"انتخاب یک اپراتور شبکه"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"تاریخ و ساعت"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"تنظیم تاریخ و زمان"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"تنظیم تاریخ و زمان"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"تنظیم تاریخ، ساعت، منطقه زمانی و قالب ها"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"زمان و تاریخ خودکار"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"استفاده از زمان ارائه شده توسط شبکه"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل محل ذخیره اطلاعات کاربری"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"تنظیم مکان من، بازگشایی قفل صفحه، قفل محل ذخیره اطلاعات کاربری"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"رمزهای ورود"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"رمزگذاری دستگاه"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"رمزگذاری داده ها در دستگاه"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"رمزگذاری داده ها در دستگاه"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"باید برای یک پین قفل گشایی یا رمز ورود برای دستگاه تنظیم کنید"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"باید برای یک پین قفل گشایی یا رمز ورود برای دستگاه تنظیم کنید"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"رمز گذاری شده"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"شما می توانید حساب های خود، تنظیمات و برنامه های کاربری دانلود شده و داده های آنها، رسانه و سایر فایل های خود را رمز گذاری کنید. هنگامی که گوشی خود را رمزگذاری می کنید، فقط با بازنشانی داده های کارخانه و پاک کردن همه داده های موجود در آن می توانید گوشی را رمزگشایی کنید."\n\n"رمزگذاری یک ساعت طول می کشد. هنگام شروع باید باتری از شارژ کامل برخوردار باشد و دوشاخه برق گوشی خود را تا پایان رمزگذاری از پریز جدا نکنید. در صورت قطع مرحله رمزگذاری، همه داده های خود یا قسمتی از آنها را از دست خواهید داد."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"شما می توانید حساب های خود، تنظیمات و برنامه های کاربری دانلود شده و داده های آنها، رسانه و سایر فایل های خود را رمز گذاری کنید. هنگامی که گوشی خود را رمزگذاری می کنید، فقط با بازنشانی داده های کارخانه و پاک کردن همه داده های موجود در آن می توانید گوشی را رمزگشایی کنید."\n\n"رمزگذاری یک ساعت طول می کشد. هنگام شروع باید باتری از شارژ کامل برخوردار باشد و دوشاخه برق گوشی خود را تا پایان رمزگذاری از پریز جدا نکنید. در صورت قطع مرحله رمزگذاری، همه داده های خود یا قسمتی از آنها را از دست خواهید داد."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"رمزگذاری رایانه لوحی شخصی"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"رمزگذاری گوشی"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"تأیید رمزگذاری"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"داده های کاربر را رمزگذاری می کنید؟ این عملیات قابل بازگشت نیست و در صورت قطع آن ممکن است داده های خود را از دست بدهید! رمزگذاری ممکن است حدود یک ساعت طول بکشد."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"داده های کاربر را رمزگذاری می کنید؟ این عملیات قابل بازگشت نیست و در صورت قطع آن ممکن است داده های خود را از دست بدهید! رمزگذاری ممکن است حدود یک ساعت طول بکشد."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"رمزگذاری"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"بعد از ^1 ثانیه دوباره امتحان کنید."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"پیکربندی قفل صفحه"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"پیکربندی قفل صفحه"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"تنظیمات ذخیره سازی"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"قطع اتصال حافظه USB، مشاهده حافظه موجود"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"جدا کردن کارت SD، مشاهده محل ذخیره موجود"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"شماره تلفن من"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"شماره تلفن من"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"نسخه PRL"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"حافظه داخلی"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"حافظه USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"کارت SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"فضای موجود"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"کل فضا"</string>
+    <string name="memory_available" msgid="5052397223077021181">"موجود"</string>
+    <string name="memory_size" msgid="5458889090691922288">"مجموع"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"در حال محاسبه..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"استفاده از برنامه"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"استفاده از رسانه"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"برنامه های کاربردی"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"رسانه"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"قطع اتصال حافظه مشترک"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"جدا کردن کارت SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"قطع اتصال حافظه USB داخلی"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"با این کار همه اطلاعات "<b>"حافظه داخلی"</b>" رایانه لوحی شما پاک می شود، از جمله:"\n\n<li>"حساب Google شما"</li>\n<li>"سیستم و داده های برنامه و تنظیمات"</li>\n<li>"برنامه های دانلود شده"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"با این کار همه اطلاعات "<b>"حافظه داخلی"</b>" گوشی شما پاک می شود، از جمله:"\n\n<li>"حساب Google شما"</li>\n<li>"سیستم و داده های برنامه و تنظیمات"</li>\n<li>"برنامه های دانلود شده"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"شما در حال حاضر به حساب های زیر وارد شده اید:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"موسیقی"</li>\n<li>"عکس ها"</li>\n<li>"سایر اطلاعات کاربر"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"برای پاک کردن موسیقی، عکس ها و سایر داده های کاربر، "<b>"حافظه USB"</b>" باید پاک شود."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n"برای پاک کردن موسیقی، تصاویر و سایر داده های کاربر، "\n"کارت SD"<b>"SD"</b>" نیز باید پاک شود."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"پاک کردن حافظه USB"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"تنظیم و مدیریت شبکه های خصوصی مجازی (VPN)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(بدون تغییر)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(تنظیم نشده)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"ذخیره اطلاعات کاربری"</string>
     <string name="credentials_access" msgid="4843187230913860492">"استفاده از اطلاعات کاربری ایمن"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"به برنامه های کاربردی اجازه می دهد به گواهی های ایمن و دیگر اطلاعات کاربری دسترسی داشته باشد."</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"نصب از حافظه USB"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"نصب از کارت SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"نصب گواهی ها از حافظه USB"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"نصب مجوزها از کارت SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"تنظیم رمز ورود"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"تنظیم یا تغییر رمز ورود محل ذخیره اطلاعات کاربری"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"پاک کردن محل ذخیره سازی"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"محل ذخیره اطلاعات کاربری تمام محتواها را پاک کرده و رمز ورود را بازنشانی کنید"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"تنظیم یا تغییر رمز ورود برای ذخیره اطلاعات کاربری"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"پاک کردن اطلاعات کاربری"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"حذف همه محتواها و بازنشانی رمز ورود"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"رمز ورود را وارد کنید"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"رمز ورود دستگاه ذخیره سازی اطلاعات کاربری را وارد کنید."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"رمز ورود را برای حافظه اطلاعات کاربری وارد کنید."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"رمز ورود را برای حافظه اطلاعات کاربری تنظیم کنید. این رمز ورود باید حداقل 8 نویسه داشته باشد."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"رمز ورود فعلی:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"رمز ورود جدید:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"تأیید رمز ورود جدید:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"مطمئن هستید می خواهید تمام اطلاعات کاربری را حذف کرده و رمز ورود دستگاه ذخیره سازی را بازنشانی کنید؟"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"همه محتوا حذف می شود و رمز ورود بازنشانی می شود. آیا مطمئن هستید؟"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"رمزهای ورود مطابقت ندارند."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"رمز ورود باید حداقل 8 نویسه داشته باشد."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"لطفاً رمز ورود صحیح را وارد کنید."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"لطفاً رمز ورود صحیح را وارد کنید. شما یک بار دیگر قبل از پاک شدن محل ذخیره اطلاعات کاربری می توانید رمز ورود صحیح را وارد کنید."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"محل ذخیره اطلاعات کاربری پاک شد."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"رمز ورود نادرست است."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"رمز ورود نادرست است. قبل از پاک کردن حافظه اطلاعات کاربری، یک بار دیگر می توانید رمز خود را وارد کنید."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"رمز ورود نادرست است. قبل از پاک شدن حافظه اطلاعات کاربری، <xliff:g id="NUMBER">%1$d</xliff:g> بار دیگر می توانید رمز ورود را وارد کنید."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"حافظه اطلاعات کاربری پاک شد."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"ذخیره سازی اطلاعات کاربری فعال شد."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"آهنگ اضطراری"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"واکنش موجود در هنگام برقراری تماس اضطراری را تنظیم کنید"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"در حال اتصال..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"به مرحله بعدی بروید"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP پشتیبانی نمی شود"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"در حین مراحل تنظیم می توانید یک اتصال EAP Wi-Fi را تنظیم کنید. پس از تنظیم، این کار را می توانید از طریق تنظیمات، در قسمت بی سیم و شبکه ها انجام دهید."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"امکان پیکربندی اتصال EAP Wi-Fi در حین نصب وجود ندارد. پس از راه اندازی، می توانید این کار را از طریق گزینه تنظیمات، در "<b>"بی سیم و شبکه ها"</b>" انجام دهید."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"اتصال چند دقیقه طول می کشد..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"برای ادامه تنظیم، "<b>"بعدی"</b>" را لمس کنید."\n\n" برای اتصال به یک شبکه Wi-Fi دیگر، "<b>"برگشت"</b>" را لمس کنید."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"همگام سازی تنظیمات"</string>
     <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"همگام سازی در حال حاضر دارای مشکلی است. در مدت کوتاهی تصحیح می شود."</string>
     <string name="add_account_label" msgid="7811707265834013767">"افزودن حساب"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"همگام سازی برای این مورد در حال حاضر غیرفعال است. برای تغییر تنظیمات برگزیده خود، داده پس زمینه و همگام سازی خودکار را موقتاً روشن کنید."</string>
     <string name="enter_password" msgid="3268224850821675915">"برای رمزگشایی حافظه رمز ورود را وارد کنید"</string>
     <string name="try_again" msgid="5904121494468643129">"متأسفیم، دوباره امتحان کنید"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"سرویس مشغول است، دوباره امتحان کنید"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index e872b92..85f323d 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth-laiteparipyyntö"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Laiteparinmuodostuspyyntö"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Muodostetaan laitepari laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Näytä vastaanotetut tiedostot"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Näytä Bluetoothin kautta vastaanotetut tiedostot"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth-laitevalitsin"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-yhteyspyyntö"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Sovellus pyytää lupaa ottaa Bluetooth-yhteys käyttöön. Haluatko myöntää luvan?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Operaattorin valinta"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Valitse verkko-operaattori"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Päivämäärä ja aika"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Aseta aika ja päivämäärä"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Aseta päivämäärä ja aika"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Aseta päivämäärä, aika, aikavyöhyke ja muodot"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Automaattinen päivä ja aika"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Käytä verkon määrittämää aikaa"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Aseta Oma sijainti, näytön lukituksen poisto, SIM-kortin lukitus, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Aseta Oma sijainti, näytön lukituksen poisto, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Salasanat"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Laitteen salaus"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Salaa laitteen tiedot"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Salaa laitteen tiedot"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Anna laitteen lukituksenpoisto-PIN-koodi tai -salasana"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Anna laitteen lukituksenpoisto-PIN-koodi tai -salasana"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Salattu"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Voit salata tilisi, asetuksesi, ladatut sovelluksesi ja niiden tiedot, media- ja muut tiedostot. Tablet-laitteesi salaamisen jälkeen voit purkaa salauksen vain palauttamalla tehtaan oletusasetukset, jolloin kaikki puhelimesi tiedot poistetaan.￼￼"\n\n"Salaus kestää korkeintaan tunnin. Se tulee aloittaa täydellä akulla ja puhelin täytyy pitää kytkettynä laturiin kunnes salaus on valmis. Jos keskeytät salausprosessin, menetät tallentamasi tiedot osittain tai kokonaan."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Voit salata tilisi, asetuksesi, ladatut sovelluksesi ja niiden tiedot, media- ja muut tiedostot. Tablet-laitteesi salaamisen jälkeen voit purkaa salauksen vain palauttamalla tehtaan oletusasetukset, jolloin kaikki puhelimesi tiedot poistetaan.￼￼"\n\n"Salaus kestää korkeintaan tunnin. Se tulee aloittaa täydellä akulla ja puhelin täytyy pitää kytkettynä laturiin kunnes salaus on valmis. Jos keskeytät salausprosessin, menetät tallentamasi tiedot osittain tai kokonaan."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Salaa tablet-laite"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Salaa puhelin"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Vahvista salaus"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Salataanko käyttäjän tiedot? Tätä toimintoa ei voi peruuttaa eikä keskeyttää ilman tietojen menetystä. Salaus voi kestää korkeintaan tunnin."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Salataanko käyttäjän tiedot? Tätä toimintoa ei voi peruuttaa eikä keskeyttää ilman tietojen menetystä. Salaus voi kestää korkeintaan tunnin."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Salaus käynnissä"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Yritä uudelleen ^1 sekunnin kuluttua."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Määritä ruudun lukitus"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Määritä ruudunlukitus"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Tallennusasetukset"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Poista USB-tila käytöstä, katso käytettävissä oleva tallennustila"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Poista SD-kortti käytöstä, näytä käytettävissä oleva tallennustila"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Oma puhelinnumero"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Oma puhelinnumero"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL-versio"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Sisäinen tallennustila"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-tallennustila"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kortti"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Käytettävissä oleva tila"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Tallennustilaa yhteensä"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Käytettävissä"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Yhteensä"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Lasketaan…"</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Sovellusten käyttö"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Median käyttö"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Sovellukset"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Poista jaettu tila käyt."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Poista SD-kortti käytöstä"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Poista sis. USB-tila käytöstä"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Kaikki tablet-laitteesi "<b>"sisäisen tallennustilan"</b>" tiedot poistetaan. Näihin kuuluvat "\n\n<li>"Google-tilisi"</li>\n<li>"järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"ladatut sovellukset"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Kaikki puhelimesi "<b>"sisäisen tallennustilan"</b>" tiedot poistetaan. Näihin kuuluvat "\n\n<li>"Google-tilisi"</li>\n<li>"järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"ladatut sovellukset"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olet kirjautunut sisään seuraaviin tileihin:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiikki"</li>\n<li>"Valokuvat"</li>\n<li>"Muut käyttäjän tiedot"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Jos haluat poistaa myös musiikin, kuvat ja muuta käyttäjän tiedot, "<b>"USB-tallennustila"</b>" tulee tyhjentää."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Jos haluat poistaa myös musiikin, kuvat ja muut käyttäjän tiedot, "<b>"SD-kortti"</b>" tulee tyhjentää."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Tyhjennä USB-tallennustila"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Ota käyttöön ja hallinnoi virtuaalisia yksityisverkkoja (VPN)."</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(ei muutettu)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ei asetettu)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Käyttöoikeustietojen tallennus"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Käytä suojattuja käyttöoikeustietoja"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Anna sovelluksien käyttää suojattuja varmenteita ja muita käyttöoikeustietoja"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Asenna USB-tilasta"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Asenna SD-kortilta"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Asenna varmenteet USB-tilasta"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Asenna varmenteet SD-kortilta"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Aseta salasana"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Aseta tai muuta käyttöoikeustietojen tallennustilan salasana"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Tyhjennä tallennustila"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Tyhjennä käyttöoikeustietojen tallennustila kokonaan ja palauta sen salasana"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Aseta käyttöoikeustietojen tallennustilan salasana tai vaihda salasanaa"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Tyhjennä käyttöoikeustiedot"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Poista kaikki sisältö ja nollaa salasana"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Anna salasana"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Anna käyttöoikeustietojen tallennustilan salasana."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Anna käyttöoikeustietojen tallennustilan salasana."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Aseta salasana käyttöoikeustietojen tallennustilalle. Salasanassa on oltava vähintään 8 merkkiä."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nykyinen salasana:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Uusi salasana:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Vahvista uusi salasana:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Haluatko varmasti poistaa kaikki käyttöoikeustiedot ja palauttaa käyttöoikeustietojen salasanan?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Kaikki sisältö poistetaan ja salasana nollataan. Haluatko jatkaa?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Salasanat eivät täsmää."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Salasanassa täytyy olla vähintään 8 merkkiä."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Anna oikea salasana."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Anna oikea salasana. Voit yrittää antaa oikean salasanan vielä yhden kerran, ennen kuin tallennetut käyttöoikeustiedot tyhjennetään."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"Käyttöoikeustietojen tallennustila on tyhjennetty."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Virheellinen salasana."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Väärä salasana. Yksi yritys jäljellä, ennen kuin käyttöoikeustietojen tallennustila tyhjennetään."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Väärä salasana. Jäljellä <xliff:g id="NUMBER">%1$d</xliff:g> yritystä, ennen kuin käyttöoikeustietojen tallennustila tyhjennetään."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Käyttöoikeustietojen tallennustila on tyhjennetty."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Käyttöoikeustietojen tallentaminen on käytössä."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Hätäpuhelun ääni"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Aseta toiminta hätäpuhelun tapauksessa"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Yhdistetään..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Siirry seuraavaan vaiheeseen"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP:tä ei tueta"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Et voi määrittää EAP wifi -yhteyttä asennuksen aikana. Voit määrittää yhteyden asennuksen jälkeen asetusten kohdassa Langaton verkko ja verkot."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Et voi määrittää EAP wifi -yhteyttä asennuksen aikana. Asennuksen jälkeen voit suorittaa määrityksen Asetusten kohdassa "<b>"Langaton verkko ja verkot"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Yhteyden muodostaminen voi kestää muutaman minuutin..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Jatka asetuksien määrittämistä koskettamalla "<b>"Seuraava"</b>"."\n\n"Muodosta yhteys eri wifi-verkkoon koskettamalla "<b>"Takaisin"</b>"."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Synkronointiasetukset"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Synkronoinnissa on tällä hetkellä ongelmia. Palvelu palaa käyttöön hetken kuluttua."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Lisää tili"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Tämän kohteen synkronointi on tällä hetkellä pois käytöstä. Voit muuttaa asetuksia ottamalla taustatiedot ja automaattisen synkronoinnin väliaikaisesti käyttöön."</string>
     <string name="enter_password" msgid="3268224850821675915">"Poista tallennustilan salaus antamalla salasana"</string>
     <string name="try_again" msgid="5904121494468643129">"Yritä uudelleen"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Palvelu varattu, yritä uudelleen"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 7899128..4fe626d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Demande d\'association Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Demande d\'association"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Sélectionner pour associer à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Afficher les fichiers reçus"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Afficher la liste des fichiers reçus via Bluetooth"</string>
     <string name="device_picker" msgid="8721012448931226323">"Sélecteur de périphérique Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Demande d\'autorisation Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Une application demande l\'autorisation d\'activer Bluetooth. Voulez-vous l\'activer ?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Sélection de l\'opérateur"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Choisir un opérateur réseau"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Date et heure"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Définir la date et l\'heure"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Régler la date et l\'heure"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Configurer la date, l\'heure, le fuseau horaire et les formats"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Date/Heure automatique"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utiliser la date et l\'heure fournies par le réseau"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mots de passe"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Cryptage de l\'appareil"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Crypter les données sur l\'appareil"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Crypter les données sur l\'appareil"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Nécessite la création d\'un code PIN ou d\'un mot de passe pour déverrouiller l\'appareil."</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Nécessite la création d\'un code PIN ou d\'un mot de passe pour déverrouiller l\'appareil."</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Crypté"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Vous pouvez crypter vos comptes, vos paramètres, les applications que vous téléchargez et leurs données, vos supports et autres fichiers. Une fois votre téléphone crypté, vous ne pourrez le décrypter qu\'en réinitialisant la configuration usine. Toutes les données du téléphone seront effacées."\n\n"Le cryptage peut prendre jusqu\'à une heure. La batterie doit être chargée lors du démarrage du processus et le téléphone doit rester branché jusqu\'à la fin de celui-ci. Si toutefois vous l\'interrompez, vous perdrez certaines de vos données, voire la totalité."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Vous pouvez crypter vos comptes, vos paramètres, les applications que vous téléchargez et leurs données, vos supports et autres fichiers. Une fois votre téléphone crypté, vous ne pourrez le décrypter qu\'en réinitialisant la configuration usine. Toutes les données du téléphone seront effacées."\n\n"Le cryptage peut prendre jusqu\'à une heure. La batterie doit être chargée lors du démarrage du processus et le téléphone doit rester branché jusqu\'à la fin de celui-ci. Si toutefois vous l\'interrompez, vous perdrez certaines de vos données, voire la totalité."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Crypter la tablette"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Crypter le téléphone"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Valider le cryptage"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Crypter les données utilisateur ? Cette opération est irréversible et ne doit pas être interrompue afin d\'éviter toute perte de données. Le cryptage peut prendre jusqu\'à une heure."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Crypter les données utilisateur ? Cette opération est irréversible et ne doit pas être interrompue afin d\'éviter toute perte de données. Le cryptage peut prendre jusqu\'à une heure."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Cryptage en cours"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Réessayez dans ^1 secondes."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Configurer écran verr."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Configurer écran verr."</string>
@@ -519,7 +514,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Passerelle"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longueur du préfixe réseau"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Point d\'accès Wi-Fi mobile"</string>
+    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Point d\'accès Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Point d\'accès Wi-Fi mobile <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actif"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erreur liée au point d\'accès Wi-Fi mobile"</string>
     <string name="wifi_tether_settings_text" msgid="123573487844470195">"Paramètres du point d\'accès Wi-Fi mobile"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Paramètres de stockage"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Désinstaller la mémoire de stockage USB, afficher l\'espace disponible"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Retirer la carte SD, afficher la mémoire disponible"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Mon numéro de téléphone"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"Numéro de répertoire mobile"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Mon numéro de téléphone"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Version PRL"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Mémoire de stockage interne"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Mémoire de stockage USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Carte SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Espace disponible"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Espace total"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Disponible"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calcul en cours"</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Utilisation des applications"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Utilisation des supports"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Applications"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Support"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Démonter stockage partagé"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Désactiver la carte SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Désinstaller mémoire USB interne"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :"\n\n<li>"Votre compte Google"</li>\n<li>"Les données et les paramètres des applications et du système"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre mobile, y compris :"\n\n<li>"Votre compte Google"</li>\n<li>"Les données et les paramètres des applications et du système"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musique"</li>\n<li>"Photos"</li>\n<li>"Autres données utilisateur"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Pour supprimer également la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Pour supprimer également de la musique, des images et d\'autres données utilisateur, la "<b>"carte SD"</b>" doit être effacée."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Effacer la mémoire USB"</string>
@@ -775,7 +769,7 @@
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Partage de connexion"</string>
     <string name="tether_settings_title_all" msgid="8356136101061143841">"Partage connexion/point accès mobile"</string>
     <string name="tether_settings_summary_usb" product="tablet" msgid="785883365108362248">"Partager la connexion Internet de la tablette via un câble USB"</string>
-    <string name="tether_settings_summary_usb" product="default" msgid="3562431455625637370">"Partagez la connexion Internet de votre mobile via un câble USB."</string>
+    <string name="tether_settings_summary_usb" product="default" msgid="3562431455625637370">"Partager la connexion Internet de votre mobile via un câble USB"</string>
     <string name="tether_settings_summary_wifi" msgid="5474383125137372164">"Transformer sa connexion Internet en point d\'accès Wi-Fi mobile"</string>
     <string name="tether_settings_summary_bluetooth" msgid="2407506656353819750">"Partager la connexion Internet via Bluetooth"</string>
     <string name="tether_settings_summary_usb_wifi" product="tablet" msgid="3834674129575844910">"Partager la connexion Internet de la tablette via USB ou transformer l\'appareil en point d\'accès Wi-Fi"</string>
@@ -878,7 +872,7 @@
     <string name="lock_title" product="default" msgid="4059246467204273930">"Sécurisation de votre téléphone"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Protégez votre tablette contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran. À l\'aide de votre doigt, reliez les points dans l\'ordre de votre choix sur l\'écran suivant. Vous devez relier au moins quatre points. "\n\n"Vous êtes prêt ? Appuyez sur \"Suivant\"."</string>
     <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Protégez votre téléphone contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran. "\n<font height="17">\n</font><b>"1"</b>"  L\'écran suivant vous présente un exemple de schéma. "\n<font height="17">\n</font><b>"2"</b>"  Lorsque vous êtes prêt, dessinez votre propre schéma de déverrouillage. Essayez-en plusieurs, mais veillez à relier au moins quatre points. "\n<font height="17">\n</font><b>"3"</b>"  Reproduisez votre schéma pour confirmer votre choix. "\n<font height="17">\n</font><b>"Pour commencer, appuyez sur \"Suivant\""</b>". "\n<font height="3">\n</font>"Si vous ne souhaitez pas activer la protection, appuyez sur \"Annuler\"."</font></string>
-    <string name="manageapplications_settings_title" msgid="5712405848153426706">"Gérer les applications"</string>
+    <string name="manageapplications_settings_title" msgid="5712405848153426706">"Gérer applications"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Gérer et supprimer les applications installées"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Applications"</string>
     <string name="applications_settings_summary" msgid="2714215108369119717">"Gérer les applications, configurer des raccourcis de lancement rapide"</string>
@@ -888,7 +882,7 @@
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Votre tablette et vos données personnelles sont plus vulnérables face à des applications provenant de sources inconnues. En cas de dommage causé à votre tablette ou de perte de données découlant de l\'utilisation de telles applications, vous en acceptez l\'entière responsabilité."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Votre téléphone et vos données personnelles sont très vulnérables face à des applications provenant de sources inconnues. Vous acceptez d\'être le seul responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informations sur l\'application"</string>
-    <string name="storage_label" msgid="8700867073480107253">"Mémoire"</string>
+    <string name="storage_label" msgid="8700867073480107253">"Stockage"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Lancer par défaut"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Autorisations"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
@@ -919,8 +913,8 @@
     <string name="filter_dlg_title" msgid="6507663329723966854">"Options du filtre"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Toutes"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Téléchargées"</string>
-    <string name="filter_apps_running" msgid="7767071454371350486">"En cours d\'exécution"</string>
-    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Mémoire de stockage USB"</string>
+    <string name="filter_apps_running" msgid="7767071454371350486">"En cours"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Stockage USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Sur la carte SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Désactivée"</string>
     <string name="no_applications" msgid="5190227407135243904">"Aucune application"</string>
@@ -973,7 +967,7 @@
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
     <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> libre"</string>
-    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> utilisé"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> utilisés"</string>
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
@@ -1176,11 +1170,11 @@
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Paramètres de \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Paramètres de la synthèse vocale"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Synthèse vocale"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Tjrs utiliser mes param."</string>
-    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Les param. par défaut ci-dessous remplacent les param. de l\'application"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Utiliser mes paramètres"</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Remplacer les paramètres de l\'application par les paramètres ci-dessous"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Paramètres par défaut"</string>
     <string name="tts_default_synth_title" msgid="29467896463371992">"Moteur par défaut"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Définit le moteur de synthèse vocale à utiliser."</string>
+    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Définir le moteur de synthèse vocale à utiliser"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Cadence"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Vitesse à laquelle le texte est énoncé"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Configurer et gérer les réseaux privés virtuels (VPN)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(aucune modification)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(non défini)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Stockage des identifiants"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Identifiants sécurisés"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Autoriser l\'accès des applications aux certificats sécurisés et identifiants"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Installer depuis mém. stock. USB"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Installer depuis la carte SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Installer les certificats depuis la mémoire de stockage USB"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Installer les certificats depuis la carte SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Définir le mot de passe"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Définir ou modifier le mot de passe de stockage des identifiants"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Effacer le stockage"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Effacer le contenu du stockage des identifiants et réinitialiser le mot de passe"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Définir ou modifier le mot de passe pour le stockage des identifiants"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Effacer les identifiants"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Supprimer l\'ensemble du contenu et réinitialiser le mot de passe"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Saisir le mot de passe"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Saisissez le mot de passe du stockage des identifiants."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Saisir le mot de passe de stockage des identifiants"</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Définir le mot de passe pour le stockage des identifiants. Il doit comporter au moins huit caractères."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Mot de passe actuel :"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Nouveau mot de passe :"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmer le nouveau mot de passe :"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Voulez-vous vraiment supprimer tous les identifiants et réinitialiser le mot de passe de stockage des identifiants ?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"L\'ensemble du contenu sera effacé et le mot de passe réinitialisé. Voulez-vous vraiment continuer ?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Les mots de passe ne concordent pas."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Le mot de passe doit contenir au moins 8 caractères."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Veuillez saisir le mot de passe approprié."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Veuillez saisir le mot de passe approprié. Il vous reste un essai avant que le stockage des identifiants ne soit effacé."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"Le stockage des identifiants est effacé."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Mot de passe incorrect"</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Mot de passe incorrect. Vous disposez d\'une tentative supplémentaire avant l\'effacement du stockage des identifiants."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Mot de passe incorrect. Vous disposez de <xliff:g id="NUMBER">%1$d</xliff:g> tentatives supplémentaires avant l\'effacement du stockage des identifiants."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Le stockage des identifiants est effacé."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Stockage des identifiants activé"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Sonnerie d\'urgence"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Définir le comportement en cas d\'appel d\'urgence"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Connexion en cours…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Passer à l\'étape suivante"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP non compatible"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Vous ne pouvez pas configurer une connexion Wi-Fi EAP lors de l\'installation. Une fois celle-ci terminée, vous pourrez le faire dans Paramètres, sous Sans fil et réseaux."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Impossible de configurer une connexion Wi-Fi EAP lors de l\'installation. Vous pourrez le faire dans Paramètres, sous "<b>"Sans fil et réseaux"</b>", une fois l\'installation terminée."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"La connexion peut prendre quelques minutes."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Appuyez sur "<b>"Suivant"</b>" pour poursuivre la configuration."\n\n"Appuyez sur "<b>"Précédent"</b>" pour vous connecter à un autre réseau Wi-Fi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Paramètres de synchronisation"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"La synchronisation rencontre des problèmes et sera bientôt rétablie."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Ajouter un compte"</string>
@@ -1416,14 +1401,13 @@
     <string name="really_remove_account_title" msgid="6574643117748564960">"Supprimer le compte"</string>
     <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Voulez-vous vraiment supprimer ce compte ? Les éléments suivants seront également supprimés du téléphone : messages, contacts et autres données."\n"Voulez-vous continuer ?"</string>
     <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Voulez-vous vraiment supprimer ce compte? Les éléments suivants seront également supprimés du téléphone : messages, contacts et autres données. "\n"Voulez-vous continuer?"</string>
-    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Des applications utilisent ce compte. Pour le supprimer, vous devez restaurer les valeurs d\'usine de la tablette sous Paramètres &gt; Confidentialité, ce qui a pour effet d\'effacer toutes vos données personnelles."</string>
-    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Des applications utilisent ce compte. Pour le supprimer, vous devez restaurer les valeurs d\'usine du téléphone (cela efface toutes vos données personnelles) via l\'application Paramètres, sous Confidentialité."</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Des applications utilisent ce compte. Pour le supprimer, vous devez restaurer les valeurs par défaut de la tablette sous Paramètres &gt; Confidentialité, ce qui a pour effet d\'effacer toutes vos données personnelles."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Des applications utilisent ce compte. Pour le supprimer, vous devez restaurer les valeurs par défaut du téléphone (cela efface toutes vos données personnelles) via l\'application Paramètres, sous Confidentialité."</string>
     <string name="provider_label" msgid="7724593781904508866">"Abonnements Push"</string>
     <string name="sync_item_title" msgid="1931551540462877488">"Synchroniser <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Impossible de procéder à la synchronisation manuelle."</string>
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"La synchronisation de cet élément est actuellement désactivée. Pour modifier vos préférences, activez temporairement les données en arrière-plan et la synchronisation automatique."</string>
     <string name="enter_password" msgid="3268224850821675915">"Saisir le mot de passe pour décrypter le stockage"</string>
     <string name="try_again" msgid="5904121494468643129">"Incorrect. Merci de réessayer."</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Service indisponible, réessayez."</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 4837ec8..8d16ff1 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Zahtjev za Bluetooth uparivanje"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Zahtjev za uparivanje"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Odaberi uparivanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Prikaži primljene datoteke"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Prikaži popis datoteka primljenih putem Bluetootha"</string>
     <string name="device_picker" msgid="8721012448931226323">"Alat za odabir Bluetooth uređaja"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Zatraženo je Bluetooth dopuštenje"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Aplikacija traži dozvolu za uključenje Bluetootha. Želite li to učiniti?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Odabir operatora"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Odaberite mrežnog operatera"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum i vrijeme"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Postavi Datum i vrijeme"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Postavite datum i vrijeme"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Postavi datum, vrijeme, vremensku zonu i formate"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Automatski datum &amp; vrijeme"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Upotrijebi vrijeme mreže"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje SIM kartice, zaključavanje spremnika za vjerodajnice"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje pohranjivanja vjerodajnica"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Zaporke"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripcija uređaja"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kriptiraj podatke na uređaju"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kriptiraj podatke na uređaju"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Od vas se traži postavljanje PIN-a ili zaporke za otključavanje uređaja"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Od vas se traži postavljanje PIN-a ili zaporke za otključavanje uređaja"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Kriptirano"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatke, medijske i ostale datoteke. Nakon kriptiranja telefona, pored vraćanja na tvorničke postavke, dekriptirati ga možete i brisanjem svih podataka na telefonu."\n\n"Enkripcija traje i do jednog sata. Morate je započeti s napunjenom baterijom telefona i držati ga uključenim u struju do dovršetka kriptiranja. Ako prekinete postupak enkripcije, izgubit ćete dio ili sve svoje podatke."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatke, medijske i ostale datoteke. Nakon kriptiranja telefona, pored vraćanja na tvorničke postavke, dekriptirati ga možete i brisanjem svih podataka na telefonu."\n\n"Enkripcija traje i do jednog sata. Morate je započeti s napunjenom baterijom telefona i držati ga uključenim u struju do dovršetka kriptiranja. Ako prekinete postupak enkripcije, izgubit ćete dio ili sve svoje podatke."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Kriptiraj tablet uređaj"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Kriptiraj telefon"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Potvrda enkripcije"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Kriptirati korisničke podatke? Tu operaciju nije moguće poništiti niti prekinuti bez gubitka podataka! Enkripcija može potrajati do jedan sat."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Kriptirati korisničke podatke? Tu operaciju nije moguće poništiti niti prekinuti bez gubitka podataka! Enkripcija može potrajati do jedan sat."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Kriptiranje"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Pokušajte ponovo za 1 s."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Konf. zak. zaslona"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Konfiguracija zaključavanja zaslona"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Postavke pohrane"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Isključi USB memoriju, prikaži dostupnu pohranu"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Isključi SD karticu, prikaži vidljivo mjesto za pohranu"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Moj telefonski broj"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Moj telefonski broj"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL verzija"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Unutarnja pohrana"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB memorija"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD kartica"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Dostupan prostor"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Ukupno prostora"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Dostupno"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Ukupno"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Izračun u tijeku..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Upotreba aplikacije"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Upotreba medija"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplikacije"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Mediji"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Isklj. dijeljenu pohranu"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Isključi SD karticu"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Isključi unutarnju USB memoriju"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" vašeg tabletnog uređaja, uključujući:"\n\n<li>"Vaš Google Račun"</li>\n<li>"Sistemske podatke i podatke aplikacije i postavke"</li>\n<li>"Preuzete aplikacije"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" vašeg telefona, uključujući:"\n\n<li>"Vaš Google Račun"</li>\n<li>"Sistemske podatke i podatke aplikacije i postavke"</li>\n<li>"Preuzete aplikacije"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutačno ste prijavljeni na sljedeće račune:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Glazba"</li>\n<li>"Fotografije"</li>\n<li>"Ostali korisnički podaci"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Da biste također izbrisali glazbu, slike i ostale korisničke podatke, "<b>"memorija USB"</b>" treba biti izbrisana."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, trebate izbrisati "<b>"karticu SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Izbriši USB memoriju"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Postavite i upravljajte virtualnim privatnim mrežama (VPN-ovima)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nepromijenjeno)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nije postavljeno)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Pohrana vjerodajnica"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Korisnički sigurne vjerodajnice"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Aplikacijama omogući pristup sigurnim certifikatima i drugim vjerodajnicama"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Instaliraj s USB memorije"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Instaliraj sa SD kartice"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Instaliraj kriptirane certifikate s USB memorije"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instaliraj certifikate sa SD kartice"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Postavi zaporku"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Postavite ili promijenite zaporku za pohranjivanje zaporke"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Isprazni mjesto pohrane"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Isprazni cijeli sadržaj spremnika za vjerodajnice i poništi pripadajuće zaporke"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Postavite ili promijenite zaporku za pohranu vjerodajnica"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Izbriši vjerodajnice"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Ukloni sav sadržaj i poništi zaporku"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Unesite zaporku"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Unesite zaporku za pohranu vjerodajnica."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Unesite zaporku za pohranu vjerodajnica."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Postavite zaporku za pohranu vjerodajnica. Mora sadržavati najmanje 8 znakova."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutačna zaporka:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Nova zaporka:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Potvrdite novu zaporku:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Jeste li sigurni da želite izbrisati sve vjerodajnice i poništiti zaporku za pohranjivanje vjerodajnica?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Sav će sadržaj biti uklonjen, a zaporka će biti poništena. Jeste li sigurni?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Zaporke se ne podudaraju."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Zaporka treba imati barem 8 znakova."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Unesite ispravnu zaporku."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Unesite ispravnu zaporku. Prije brisanja prostora za pohranu vjerodajnica imate još jedan pokušaj za unos ispravne zaporke."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"Prostor za pohranu vjerodajnica je izbrisan."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Pogrešna zaporka."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Pogrešna zaporka. Imate još jedan pokušaj prije brisanja pohrane vjerodajnica."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Pogrešna zaporka. Još imate ovoliko pokušaja prije brisanja pohrane vjerodajnica: <xliff:g id="NUMBER">%1$d</xliff:g>."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Pohrana vjerodajnica je izbrisana."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Pohranjivanje vjerodajnica je omogućeno."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton hitnog poziva"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Postavite način ponašanja za hitan poziv"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Povezivanje..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Produži na sljedeći korak"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP nije podržan"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Ne možete konfigurirati EAP Wi-Fi vezu tijekom postavljanja. To možete učiniti nakon postavljanja u Postavkama pod stavkom Bežično povezivanje i mreže."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Ne možete konfigurirati vezu EAP Wi-Fi tijekom postavljanja. Nakon postavljanja to možete učiniti u Postavkama, pod stavkom "<b>"Bežično povezivanje i mreže"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Povezivanje može potrajati nekoliko minuta..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Dodirnite "<b>"Dalje"</b>" za nastavak postavljanja."\n\n"Dodirnite "<b>"Natrag"</b>" za povezivanje s drugom Wi-Fi mrežom."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Sink. postavke"</string>
     <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Sinkronizacija trenutačno ima problema. Uskoro će nastaviti s radom."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Dodavanje računa"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Sinkronizacija za tu stavku trenutačno je onemogućena. Da biste promijenili svojstva, privremeno uključite pozadinske podatke i automatsku sinkronizaciju."</string>
     <string name="enter_password" msgid="3268224850821675915">"Unesite zaporku za dešifriranje pohrane"</string>
     <string name="try_again" msgid="5904121494468643129">"Pokušajte ponovno"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Usluga je zauzeta, pokušajte ponovo"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index db0c171..e4dd4c5 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth párosítási kérelem"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Párosítási kérelem"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Válassza ki a párosításhoz a következő eszközzel: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Beérkező fájlok megjelenítése"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Bluetooth-on érkezett fájlok listájának mutatása."</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth-eszközválasztó"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth engedélykérés"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Egy alkalmazás engedélyt kér a Bluetooth bekapcsolására. Megadja az engedélyt?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Szolgáltatóválasztás"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Mobilszolgáltató választása"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Dátum és idő"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Dátum és idő beállítása"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Dátum és idő beállítása"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Dátum, idő, időzóna és formátumok beállítása"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Automatikus dátum és idő"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Hálózat által megadott idő használata"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Saját pozíció beállítása, képernyőzár feloldása, SIM-kártya zárolása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Saját pozíció beállítása, képernyőzár feloldása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Jelszavak"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Eszköz titkosítása"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Adatok titkosítása az eszközön"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Adatok titkosítása az eszközön"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Használata esetén be kell állítani egy, az eszköz feloldására szolgáló PIN kódot vagy jelszavat"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Használata esetén be kell állítani egy, az eszköz feloldására szolgáló PIN kódot vagy jelszavat"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Titkosítva"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Titkosíthatja fiókjait, beállításait, letöltött alkalmazásait a kapcsolódó adatokkal együtt, valamint média- és egyéb fájljait. Telefonja titkosítása a titkosítását követően csak akkor szüntethető meg, ha visszaállítja a gyári beállításokat, amivel a telefonján szereplő minden adat törlődik."\n\n"A titkosítás akár egy órát is igénybe vehet. Feltöltött akkumulátorral kezdje meg a műveletet, és telefonját tartsa csatlakoztatva a titkosítás befejeződéséig. Ha megszakítja a titkosítás folyamatát, akkor adatainak egy része vagy teljes egésze elveszik."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Titkosíthatja fiókjait, beállításait, letöltött alkalmazásait a kapcsolódó adatokkal együtt, valamint média- és egyéb fájljait. Telefonja titkosítása a titkosítását követően csak akkor szüntethető meg, ha visszaállítja a gyári beállításokat, amivel a telefonján szereplő minden adat törlődik."\n\n"A titkosítás akár egy órát is igénybe vehet. Feltöltött akkumulátorral kezdje meg a műveletet, és telefonját tartsa csatlakoztatva a titkosítás befejeződéséig. Ha megszakítja a titkosítás folyamatát, akkor adatainak egy része vagy teljes egésze elveszik."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Táblagép titkosítása"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefon titkosítása"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Titkosítás megerősítése"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Titkosítja a felhasználói adatokat? A művelet nem vonható vissza, és nem szakítható meg adatveszteség nélkül. A titkosítás akár egy órát is igénybe vehet."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Titkosítja a felhasználói adatokat? A művelet nem vonható vissza, és nem szakítható meg adatveszteség nélkül. A titkosítás akár egy órát is igénybe vehet."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Titkosítás"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Próbálja újra ^1 másodperc múlva."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Zárolás beállítása"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Zárolás beállítása"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Tárolóhely beállításai"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB-tár leválasztása, és az elérhető tárhely megtekintése"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD-kártya leválasztása, a rendelkezésre álló tárhely megtekintése"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Saját telefonszámom"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Saját telefonszámom"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL verzió"</string>
@@ -663,8 +658,8 @@
     <string name="internal_memory" msgid="9129595691484260784">"Belső tárhely"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-tár"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kártya"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Rendelkezésre álló hely"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Összes hely"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Elérhető"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Összesen"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Számítás..."</string>
     <string name="memory_apps_usage" msgid="9079237985722858506">"Alkalmazások"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Média"</string>
@@ -737,7 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Ez törli az összes adatot táblagépe "<b>"belső tárhelyéről"</b>", ideértve:"\n\n<li>"az Ön Google Fiókját"</li>\n<li>"a rendszer- és alkalmazásadatokat és -beállításokat"</li>\n<li>"a letöltött alkalmazásokat"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Ez törli az összes adatot telefonja "<b>"belső tárhelyéről"</b>", ideértve:"\n\n<li>"az Ön Google Fiókját"</li>\n<li>"a rendszer- és alkalmazásadatokat és -beállításokat"</li>\n<li>"a letöltött alkalmazásokat"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jelenleg a következő fiókokba van bejelentkezve:"\n</string>
-    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li></li>\n<li></li>\n<li></li></string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Zene"</li>\n<li>"Fotók"</li>\n<li>"Más felhasználói adatok"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"USB-tárat"</b>" is törölnie kell."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"SD-kártyát"</b>" is törölnie kell."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB-tár törlése"</string>
@@ -1295,26 +1290,25 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Az alkalmazások hozzáférhetnek a biztonsági tanúsítványokhoz és más hitelesítési adatokhoz"</string>
     <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Telepítés USB-tárról"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Telepítés az SD-kártyáról"</string>
-    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Titkosított tanúsítványok telepítése USB-tárról"</string>
-    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Titkosított tanúsítványok telepítése az SD-kártyáról"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Tanúsítványok telepítése USB-tárról"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Tanúsítványok telepítése az SD-kártyáról"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Jelszó beállítása"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"A hitelesítési adatok tárolója jelszavának beállítása és módosítása"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Tároló ürítése"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"A hitelesítési adatok tárolója teljes tartalmának kiürítése és jelszavának visszaállítása"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"A hitelesítési adatok tárolója jelszavának beállítása vagy cseréje"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Hitelesítési adatok törlése"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Minden tartalom törlése és a jelszó visszaállítása"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Jelszó megadása"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Adja meg a hitelesítési adatok tárolójának jelszavát."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Adja meg a hitelesítési adatok tárolójának jelszavát."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Állítsa be a hitelesítési adatok tárolójának jelszavát. Legalább 8 karakter hosszúnak kell lennie."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Jelenlegi jelszó:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Új jelszó:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Új jelszó megerősítése"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Biztosan törli az összes hitelesítési adatot és visszaállítja a hitelesítési adatok tárolójának jelszavát?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Minden tartalom eltávolításra kerül, és a jelszó visszaáll. Biztos benne?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"A jelszavak nem egyeznek."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"A jelszónak legalább 8 karakter hosszúnak kell lennie."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Helytelen jelszó."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Kérjük, adja meg a helyes jelszót. Még egy alkalommal próbálkozhat, aztán a rendszer törli a hitelesítési adatok tárolóját."</string>
-    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"<xliff:g id="NUMBER">%1$d</xliff:g>"</string>
-    <string name="credentials_erased" msgid="2907836028586342969">"A hitelesítési adatok tárolója kiürítve."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Helytelen jelszó. Már csak egy lehetősége van, mielőtt a hitelesítési adatok tárolója törlődik."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Helytelen jelszó. <xliff:g id="NUMBER">%1$d</xliff:g> további lehetősége van, mielőtt a hitelesítési adatok tárolóját töröljük."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Hit. adatok tárolója üres."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"A hitelesítési adatok tárolója engedélyezve van."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Segélyhívás hangja"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Viselkedés beállítása segélyhívás kezdeményezésekor"</string>
@@ -1370,10 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Kapcsolódás..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Tovább a következő lépésre"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"Az EAP nem támogatott"</string>
-    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939"><b>"Nem lehet konfigurálni az EAP Wi-Fi kapcsolatot a telepítés során. A telepítés után ezt a Beállítások menü Vezeték nélküli és egyéb hálózatok pontjában teheti meg"</b>"."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459"><b></b>\n\n<b></b></string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Nem lehet konfigurálni az EAP Wi-Fi-kapcsolatot a telepítés során. A telepítés után ezt a Beállítások menü "<b>"Vezeték nélküli és egyéb Hálózatok"</b>" pontjában teheti meg."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"A kapcsolódás igénybe vehet pár percet..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Érintse meg a "<b>"Következő"</b>" lehetőséget a telepítés folytatásához."\n\n"Érintse meg a "<b>"Vissza"</b>" lehetőséget egy másik Wi-Fi-hálózathoz való csatlakozáshoz."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Szinkronizálási beállítások"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"A szinkronizálással problémák vannak. Hamarosan helyreáll."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Fiók hozzáadása"</string>
@@ -1416,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Ennek az elemnek a szinkronizálása jelenleg le van tiltva. Preferenciái módosításához ideiglenesen kapcsolja be a háttéradatokat és az automatikus szinkronizálást."</string>
     <string name="enter_password" msgid="3268224850821675915">"Írja be a jelszót a tárhely titkosításának feloldásához"</string>
     <string name="try_again" msgid="5904121494468643129">"Sajnáljuk, próbálja újra"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"A szolgáltatás elfoglalt, próbálja újra"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 458799f..8a73527 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Permintaan penyandingan bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Permintaan penyandingan"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Pilih untuk disandingkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Tampilkan berkas yang diterima"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Tampilkan daftar berkas yang diterima melalui Bluetooth"</string>
     <string name="device_picker" msgid="8721012448931226323">"Pemilih perangkat bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Permintaan izin bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Aplikasi meminta izin untuk menghidupkan Bluetooth. Anda ingin melakukan ini?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Pilihan operator"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Pilih operator jaringan"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Tanggal &amp; waktu"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Setel Tanggal dan waktu"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Setel tanggal dan waktu"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Setel tanggal, waktu, zona waktu, &amp; format"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Tanggal &amp; waktu otomatis"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Gunakan waktu yang disediakan jaringan"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Setel Lokasiku, pembuka kunci layar, kunci kartu SIM, kunci penyimpanan kredensial"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setel Lokasiku, pembuka kunci layar, kunci penyimpanan kredensial"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Sandi"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripsi perangkat"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Mengenkripsi data di perangkat"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Mengenkripsi data di perangkat"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Anda wajib menyetel pin buka kunci atau sandi perangkat"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Anda wajib menyetel pin buka kunci atau sandi perangkat"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Dienkripsi"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Anda dapat mengenkripsi akun, setelan, aplikasi yang diunduh dan datanya, media, serta berkas lainnya Setelah Anda mengenkripsi ponsel, Anda tidak dapat membatalkan enkripsi kecuali dengan menyetel ulang ke setelan pabrik, yang menghapus semua data di ponsel Anda."\n\n"Enkripsi memakan waktu sampai satu jam. Anda harus memulainya dengan baterai yang sudah diisi dayanya dan terus terpasang dengan ponsel hingga enkripsi selesai. Jika menyela proses enkripsi, Anda akan kehilangan sebagian atau seluruh data."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Anda dapat mengenkripsi akun, setelan, aplikasi yang diunduh dan datanya, media, serta berkas lainnya Setelah Anda mengenkripsi ponsel, Anda tidak dapat membatalkan enkripsi kecuali dengan menyetel ulang ke setelan pabrik, yang menghapus semua data di ponsel Anda."\n\n"Enkripsi memakan waktu sampai satu jam. Anda harus memulainya dengan baterai yang sudah diisi dayanya dan terus terpasang dengan ponsel hingga enkripsi selesai. Jika menyela proses enkripsi, Anda akan kehilangan sebagian atau seluruh data."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Enkripsi tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Enkripsi ponsel"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Konfirmasi enkripsi"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Enkripsi data pengguna? Operasi ini tidak dapat dibatalkan dan tidak boleh disela karena data akan hilang! Enkripsi memakan waktu sampai satu jam."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Enkripsi data pengguna? Operasi ini tidak dapat dibatalkan dan tidak boleh disela karena data akan hilang! Enkripsi memakan waktu sampai satu jam."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Mengenkripsi"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Coba lagi dalam ^1 detik."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Mengonfigurasi layar kunci"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Mengonfigurasi layar kunci"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Setelan penyimpanan"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Melepas penyimpanan USB, melihat penyimpanan yang tersedia"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Lepaskan kartu SD, lihat penyimpanan yang tersedia"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Nomor teleponku"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Nomor teleponku"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MENIT"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versi PRL"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Penyimpanan internal"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Penyimpanan USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Kartu SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Ruang tersedia"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Total ruang"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Tersedia"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Menghitung..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Penggunaan oleh aplikasi"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Penggunaan oleh media"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplikasi"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Lepas penyimpanan bersama"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Lepaskan kartu SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Lepas penyimpanan USB internal"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:"\n\n<li>"Akun Google Anda"</li>\n<li>"Data dan setelan sistem dan aplikasi"</li>\n<li>"Aplikasi yang diunduh"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:"\n\n<li>"Akun Google Anda"</li>\n<li>"Data dan setelan sistem dan aplikasi"</li>\n<li>"Aplikasi yang diunduh"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Saat ini Anda telah masuk ke akun berikut ini:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna lainnya"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Untuk menghapus musik, gambar, dan data pengguna lainnya, "<b>"penyimpanan USB"</b>" perlu dihapus."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Selain itu, untuk menghapus musik, gambar, dan data pengguna lainnya, "<b>"kartu SD"</b>" perlu dihapus."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Hapus penyimpanan USB"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Siapkan &amp; kelola VPN"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(tidak diubah)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(tidak disetel)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Penyimpanan kredensial"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Gunakan kredensial aman"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Izinkan aplikasi mengakses sertifikat aman dan kredensial lainnya"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Memasang dari penyimpanan USB"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Pasang dari kartu SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Pasang sertifikat dari penyimpanan USB"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Pasang sertifikat dari kartu SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Setel sandi"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Setel atau ubah sandi penyimpanan kredensial"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Hapus penyimpanan"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Hapus penyimpanan kredensial dari semua konten dan setel ulang sandinya"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Setel atau ubah sandi untuk penyimpanan kredensial"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Hapus kredensial"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Hapus semua konten dan setel ulang sandi"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Masukkan sandi"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Masukkan sandi penyimpanan kredensial."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Masukkan sandi untuk penyimpanan kredensial."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Setel sandi untuk penyimpanan kredensial. Paling tidak 8 karakter."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Sandi saat ini:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Sandi baru:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Konfirmasi sandi baru:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Apakah Anda ingin menghapus semua kredensial dan menyetel ulang sandi penyimpanan kredensial?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Semua konten akan dihapus, dan sandi akan disetel ulang. Yakin dengan hal ini?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Sandi tidak cocok."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Sandi minimal terdiri dari 8 karakter."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Harap masukkan sandi yang tepat."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Harap masukkan sandi yang tepat. Anda dapat mencoba sekali lagi untuk memasukkan sandi sebelum penyimpanan kredensial dihapus."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"Penyimpanan kredensial dihapus."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Sandi salah."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Sandi salah. Anda memiliki satu kesempatan sekali lagi sebelum penyimpanan kredensial dihapus."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Sandi salah. Anda memiliki <xliff:g id="NUMBER">%1$d</xliff:g> kesempatan lagi sebelum penyimpanan kredensial dihapus."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Penyimpanan kredensial dihapus."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Penyimpanan kredensial diaktifkan."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nada darurat"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Setel perilaku ketika panggilan darurat dilakukan"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Menyambung..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Lanjut ke langkah berikutnya"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP tidak didukung"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Anda tidak dapat mengonfigurasi koneksi Wi-Fi EAP selama persiapan. Setelah persiapan, Anda dapat melakukannya di bagian Setelan, di dalam Nirkabel &amp; Jaringan."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Anda tidak dapat mengonfigurasi koneksi Wi-Fi EAP selama penyiapan. Setelah penyiapan, Anda dapat melakukannya di Setelan, pada bagian "<b>"Jaringan &amp; nirkabel"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Menyambungkan membutuhkan waktu beberapa menit..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Sentuh "<b>"Berikutnya"</b>" untuk melanjutkan penyiapan. "\n\n"Sentuh "<b>"Kembali"</b>" untuk menyambung dengan jaringan Wi-Fi lainnya."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Setelan sinkronisasi"</string>
     <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Saat ini sinkronisasi mengalami masalah. Sinkronisasi akan segera kembali."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Tambahkan akun"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Saat ini sinkronisasi untuk item ini dinonaktifkan. Untuk mengubah preferensi Anda, hidupkan sinkronisasi otomatis dan data latar belakang untuk sementara."</string>
     <string name="enter_password" msgid="3268224850821675915">"Masukkan sandi untuk mendekripsi penyimpanan"</string>
     <string name="try_again" msgid="5904121494468643129">"Maaf, coba sekali lagi"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Layanan sibuk, coba lagi"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 7933b9c..2b36d46 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Richiesta accoppiamento Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Richiesta accoppiamento"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Seleziona per accoppiare <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Mostra file ricevuti"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Mostra elenco di file ricevuti tramite Bluetooth"</string>
     <string name="device_picker" msgid="8721012448931226323">"Selettore dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Richiesta autorizzazione Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Un\'applicazione chiede l\'autorizzazione per attivare Bluetooth. Procedere?"</string>
@@ -222,7 +220,7 @@
     <string name="cancel" msgid="6859253417269739139">"Annulla"</string>
     <string name="settings_label" msgid="1626402585530130914">"Impostazioni"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Impostazioni"</string>
-    <string name="settings_shortcut" msgid="8597387747077828217">"Seleziona accesso rapido impostazioni"</string>
+    <string name="settings_shortcut" msgid="8597387747077828217">"Seleziona scorciatoia impostazioni"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modalità aereo"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Disattiva tutte le connessioni wireless"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Disattivazione connessioni wireless..."</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Selezione operatore"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Seleziona un operatore di rete"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data e ora"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Imposta data e ora"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Imposta data e ora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Imposta data, ora, fuso orario e formati"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Data e ora automatiche"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utilizza l\'ora fornita dalla rete"</string>
@@ -258,7 +256,7 @@
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Ora"</string>
     <string name="lock_after_timeout" msgid="940509402681580537">"Timeout"</string>
-    <string name="lock_after_timeout_summary" msgid="4726009794344934278">"Blocca schermo <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> dopo lo spegnimento automatico dello schermo."</string>
+    <string name="lock_after_timeout_summary" msgid="4726009794344934278">"Blocca schermo <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> dopo lo spegnimento automatico dello schermo"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostra info proprietario su blocco schermo"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info proprietario"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Imposta La mia posizione, sblocco schermo, blocco SIM, blocco cred."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Imposta La mia posizione, sblocco schermo, blocco archivio credenziali"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Password"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Crittografia dispositivo"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Esegui crittografia dei dati sul dispositivo"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Esegui crittografia dei dati sul dispositivo"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Richiede di impostare un PIN o una password di sblocco dispositivo"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Richiede di impostare un PIN o una password di sblocco dispositivo"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Crittografato"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Puoi crittografare account, impostazioni, applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il telefono, non è possibile decrittografarlo se non eseguendo un ripristino dati di fabbrica, cancellando tutti i dati sul telefono."\n\n"L\'operazione richiede fino a un\'ora. Devi iniziare con una batteria carica e tenere il telefono collegato fino al termine. Se interrompi il processo di crittografia, perderai alcuni o tutti i tuoi dati."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Puoi crittografare account, impostazioni, applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il telefono, non è possibile decrittografarlo se non eseguendo un ripristino dati di fabbrica, cancellando tutti i dati sul telefono."\n\n"L\'operazione richiede fino a un\'ora. Devi iniziare con una batteria carica e tenere il telefono collegato fino al termine. Se interrompi il processo di crittografia, perderai alcuni o tutti i tuoi dati."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Esegui crittografia tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Esegui crittografia telefono"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Conferma crittografia"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Crittografare i dati dell\'utente? Questa operazione non è reversibile e non può essere interrotta senza perdita di dati. L\'operazione può richiedere fino a un\'ora."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Crittografare i dati dell\'utente? Questa operazione non è reversibile e non può essere interrotta senza perdita di dati. L\'operazione può richiedere fino a un\'ora."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Crittografia"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Riprova fra ^1 secondi."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Configura blocco schermo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Configura blocco schermo"</string>
@@ -384,11 +379,11 @@
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Impostazioni Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gestisci le connessioni, imposta il nome e la rilevabilità del dispositivo"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Richiesta accoppiamento Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Inserisci il PIN per effettuare l\'associazione con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". Prova 0000 o 1234. Potrebbe essere necessario inserire lo stesso PIN sul dispositivo Bluetooth."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Inserisci il PIN per effettuare l\'accoppiamento con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". Prova 0000 o 1234. Potrebbe essere necessario inserire lo stesso PIN sul dispositivo Bluetooth."</string>
     <string name="bluetooth_enter_passkey_msg" msgid="8301499416158195044">\n"Inserisci passkey per eseguire accoppiamento con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Per eseguire l\'accoppiamento con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", conferma che è visualizzata la passkey: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"chiede di eseguire l\'accoppiamento."</string>
-    <string name="bluetooth_display_passkey_pin_msg" msgid="9139892462102104755">"Immetti \"<xliff:g id="PASSKEY">%2$s</xliff:g>\" in \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" per eseguire l\'associazione, seguito da Invio."</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="9139892462102104755">"Immetti \"<xliff:g id="PASSKEY">%2$s</xliff:g>\" in \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" per eseguire l\'accoppiamento e premi Invio."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Accoppia"</string>
     <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Non accoppiare"</string>
     <string name="bluetooth_remote_device" msgid="2406662802908395389">"dispositivo Bluetooth"</string>
@@ -418,7 +413,7 @@
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dall\'audio multimediale."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dall\'audio vivavoce."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dal dispositivo di input."</string>
-    <string name="bluetooth_disconnect_pan_profile" msgid="877883150720888525">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dal vincolo."</string>
+    <string name="bluetooth_disconnect_pan_profile" msgid="877883150720888525">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dal tethering."</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Opzioni <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Azioni dispositivo"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Connetti"</string>
@@ -471,7 +466,7 @@
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Inserisci il PIN del punto di accesso"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Impostazione WPS"</string>
     <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Inserisci il PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> sul punto di accesso"</string>
-    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS è già in esecuzione. Sono richiesti vari secondi per il completamento"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS già in corso. Il completamento potrebbe richiedere qualche decina di secondi."</string>
     <string name="wifi_wps_failed" msgid="2277409652621482331">"Impossibile avviare WPS. Riprova."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID rete"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Protezione"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Impostazioni di archiviazione"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Smonta l\'archivio USB, visualizza lo spazio di archiviazione disponibile"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Smonta la scheda SD, visualizza spazio di archiviazione disponibile"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Il mio numero di telefono"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Il mio numero di telefono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versione PRL"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Archivio interno"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Archivio USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Scheda SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Spazio disponibile"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Spazio totale"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Disponibile"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Totale"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calcolo in corso..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Utilizzo applicazioni"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Utilizzo elementi multimediali"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Applicazioni"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Smonta archivio condiviso"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Smonta scheda SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Smonta archivio USB interno"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Questa operazione cancellerà tutti i dati dall\'"<b>"archivio interno"</b>" del Tablet PC, compresi:"\n\n<li>"L\'account Google"</li>\n<li>"I dati e le impostazioni di sistema e delle applicazioni"</li>\n<li>"Le applicazioni scaricate"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Questa operazione cancellerà tutti i dati dall\'"<b>"archivio interno"</b>" del telefono, compresi:"\n\n<li>"L\'account Google"</li>\n<li>"I dati e le impostazioni di sistema e delle applicazioni"</li>\n<li>"Le applicazioni scaricate"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Al momento sei collegato ai seguenti account:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musica"</li>\n<li>"Foto"</li>\n<li>"Altri dati utente"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Per cancellare anche musica, foto e altri dati dell\'utente, è necessario cancellare i dati dell\'"<b>"archivio USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Per cancellare anche musica, foto e altri dati dell\'utente, deve essere cancellata la "<b>"scheda SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Cancella archivio USB"</string>
@@ -1291,41 +1285,34 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Configura e gestisci le reti private virtuali (VPN)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(invariato)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(non impostato)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Archivio credenziali"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Usa credenziali protez."</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Consenti accesso applicazioni a certificati protezione e altre credenziali"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Installa da archivio USB"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Installa da scheda SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Installa certificati da archivio USB"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Installa certificati da scheda SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Imposta password"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Imposta o modifica la password dell\'archivio di credenziali"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Cancella archivio"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Cancella tutti i contenuti dall\'archivio di credenziali e reimposta la relativa password"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Imposta o modifica la password dell\'archivio di credenziali"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Cancella credenziali"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Rimuovi tutti i contenuti e reimposta la password"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Inserisci password"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Inserisci la password dell\'archivio di credenziali."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Inserisci la password per l\'archivio di credenziali."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Imposta la password per l\'archivio di credenziali. Deve essere formata da almeno 8 caratteri."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Password attuale:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Nuova password:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Conferma nuova password:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Eliminare tutte le credenziali e reimpostare la password dell\'archivio di credenziali?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Tutti i contenuti verranno rimossi e la password reimpostata. Procedere?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Le password non corrispondono."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"La password deve essere formata da almeno 8 caratteri."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Inserisci la password corretta."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Inserisci la password corretta. Hai a disposizione un altro tentativo per inserirla, dopodiché l\'archivio di credenziali verrà cancellato."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"L\'archivio di credenziali è stato cancellato."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Password errata."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Password non corretta. Hai un\'altra possibilità prima che l\'archivio credenziali venga cancellato."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Password non corretta. Hai altre <xliff:g id="NUMBER">%1$d</xliff:g> possibilità prima che l\'archivio credenziali venga cancellato."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Archivio credenziali cancellato."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"L\'archivio di credenziali è attivo."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono chiamate emergenza"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Imposta il comportamento in caso di chiamata di emergenza"</string>
-    <string name="privacy_settings" msgid="9206631214140954954">"Privacy"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Backup e ripristino"</string>
     <string name="privacy_settings_title" msgid="1987089301293213705">"Impostazioni privacy"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Backup e ripristino"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dati personali"</string>
@@ -1353,9 +1340,9 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notifiche"</string>
     <string name="sound_category_feedback_title" msgid="4399742321363475393">"Commenti"</string>
     <string name="wifi_setup_title" msgid="661074868726906436">"Impostazione Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Connesso a una rete Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Connessione a rete Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> in corso..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Connesso a una rete Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Connetti alla rete Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Connessione alla rete Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> in corso..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Connesso alla rete Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Aggiungi una rete"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Non connesso"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Aggiungi rete"</string>
@@ -1369,7 +1356,7 @@
     <string name="wifi_setup_save" msgid="3659235094218508211">"Salva"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"Annulla"</string>
     <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Scansione reti in corso..."</string>
-    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Per connettersi a una rete, toccarla"</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Tocca una rete per collegarti"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Connetti a rete esistente"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Collegati a rete non protetta"</string>
     <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Inserisci configurazione di rete"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Connessione in corso..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Procedi al passaggio successivo"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP non supportato"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Impossibile configurare una connessione Wi-Fi EAP durante l\'impostazione. Dopo l\'impostazione potrai configurarla nella sezione Impostazioni sotto Wireless e reti."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Non è possibile configurare una connessione Wi-Fi EAP durante la configurazione. Dopo la configurazione, puoi farlo in Impostazioni, "<b>"Wireless e reti"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"La connessione può richiedere qualche minuto..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Tocca "<b>"Avanti"</b>" per continuare con la configurazione."\n\n"Tocca "<b>"Indietro"</b>" per connetterti a un\'altra rete Wi-Fi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Impostazioni di sincronizzazione"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"La sincronizzazione presenta dei problemi. L\'operazione verrà presto ripristinata."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Aggiungi account"</string>
@@ -1397,7 +1382,7 @@
     <string name="sync_disabled" msgid="8511659877596511991">"La sincronizzazione non è attiva"</string>
     <string name="sync_error" msgid="5060969083117872149">"Errore sincronizz."</string>
     <string name="settings_backup" msgid="2274732978260797031">"Impostazioni di backup"</string>
-    <string name="settings_backup_summary" msgid="7916877705938054035">"Effettua backup impostazioni"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Esegui backup impostazioni"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronizza ora"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Annulla sincronizzazione"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Tocca per sincronizzare ora <xliff:g id="LAST_SYNC_TIME">
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"La sincronizzazione per questo elemento è attualmente disabilitata. Per modificare la preferenza, attiva temporaneamente i dati in background e la sincronizzazione automatica."</string>
     <string name="enter_password" msgid="3268224850821675915">"Inserisci password per decrittografare archivio"</string>
     <string name="try_again" msgid="5904121494468643129">"Riprova"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Servizio occupato, riprova"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c227868..ec5163c 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -266,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"הגדר את \'המיקום שלי\', ביטול נעילת צג, נעילת כרטיס SIM, נעילת אחסון אישורים"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת אחסון אישורים"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"סיסמאות"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"הצפנת התקן"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"הצפן נתונים בהתקן"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"הצפן נתונים בהתקן"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"אתה נדרש להגדיר PIN או סיסמה לביטול נעילת התקן"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"אתה נדרש להגדיר PIN או סיסמה לביטול נעילת התקן"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"מוצפן"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"תוכל להצפין את החשבונות וההגדרות שלך, היישומים שהורדת והנתונים, המדיה וקבצים אחרים שלהם. לאחר שתצפין את הטלפון שלך, לא תוכל לבטל את ההצפנה אלא אם תבצע איפוס נתוני יצרן, שימחק את כל הנתונים בטלפון."\n\n"ההצפנה אורכת עד שעה. עליך להתחיל בהצפנה עם סוללה מלאה ולהשאיר את הטלפון מחובר עד להשלמת ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד חלק מהנתונים שלך, או את כולם."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"תוכל להצפין את החשבונות וההגדרות שלך, היישומים שהורדת והנתונים, המדיה וקבצים אחרים שלהם. לאחר שתצפין את הטלפון שלך, לא תוכל לבטל את ההצפנה אלא אם תבצע איפוס נתוני יצרן, שימחק את כל הנתונים בטלפון."\n\n"ההצפנה אורכת עד שעה. עליך להתחיל בהצפנה עם סוללה מלאה ולהשאיר את הטלפון מחובר עד להשלמת ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד חלק מהנתונים שלך, או את כולם."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"הצפן טבלט"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"הצפן טלפון"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"אשר הצפנה"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"האם להצפין נתוני משתמש? פעולה זו היא בלתי הפיכה והפסקה של הפעולה תגרום לאובדן נתונים! ההצפנה עשויה להימשך עד שעה."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"האם להצפין נתוני משתמש? פעולה זו היא בלתי הפיכה והפסקה של הפעולה תגרום לאובדן נתונים! ההצפנה עשויה להימשך עד שעה."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"מצפין"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"נסה שוב בעוד ^1 שניות."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"הגדר נעילת מסך"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"הגדר נעילת מסך"</string>
@@ -636,7 +633,7 @@
     <string name="device_info_not_available" msgid="8062521887156825182">" לא זמין"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"מצב"</string>
     <string name="device_status" msgid="607405385799807324">"מצב"</string>
-    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"מצב הסוללה, הרשת ומידע אחר"</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"סטטוס הסוללה, הרשת ומידע אחר"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"מספר טלפון, אות וכדומה"</string>
     <string name="storage_settings" msgid="4211799979832404953">"שטח אחסון"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"הגדרות אחסון"</string>
@@ -661,8 +658,8 @@
     <string name="internal_memory" msgid="9129595691484260784">"אחסון פנימי"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"אמצעי אחסון מסוג USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"כרטיס SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"שטח אחסון זמין"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"סך הכל שטח"</string>
+    <string name="memory_available" msgid="5052397223077021181">"זמין"</string>
+    <string name="memory_size" msgid="5458889090691922288">"סך הכל"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"מחשב..."</string>
     <string name="memory_apps_usage" msgid="9079237985722858506">"יישומים"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"מדיה"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 61142b5..5047fed 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -36,8 +36,8 @@
   </string-array>
   <string-array name="animations_summaries">
     <item msgid="4569165952409350897">"ウィンドウアニメーションを表示しない"</item>
-    <item msgid="4460915688877708508">"ウィンドウアニメーションの一部を表示"</item>
-    <item msgid="488968798204105119">"ウィンドウアニメーションをすべて表示"</item>
+    <item msgid="4460915688877708508">"一部のウィンドウアニメーションを表示する"</item>
+    <item msgid="488968798204105119">"すべてのウィンドウアニメーションを表示"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15秒"</item>
@@ -99,7 +99,7 @@
     <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>に接続中..."</item>
     <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>による認証中..."</item>
     <item msgid="7928343808033020343">"IPアドレスを<xliff:g id="NETWORK_NAME">%1$s</xliff:g>から取得中..."</item>
-    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>に接続されました"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>に接続しました"</item>
     <item msgid="1330262655415760617">"保留中"</item>
     <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>から切断中..."</item>
     <item msgid="197508606402264311">"切断されました"</item>
@@ -182,7 +182,7 @@
   <string-array name="vibrate_entries">
     <item msgid="3388952299521009213">"常に使用"</item>
     <item msgid="6293147072807231256">"なし"</item>
-    <item msgid="1276641209451816572">"マナーモードでのみ"</item>
-    <item msgid="8418930333779132418">"マナーモードのときのみ"</item>
+    <item msgid="1276641209451816572">"マナーモードがオンのときのみ"</item>
+    <item msgid="8418930333779132418">"マナーモードがオフのときのみ"</item>
   </string-array>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index cba089d..9160d5c 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetoothペア設定リクエスト"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"ペア設定リクエスト"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>のペアとして設定"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"受信済みファイルの表示"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Bluetoothで受信したファイルのリストを表示する"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth端末の選択"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth許可リクエスト"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"アプリケーションがBluetoothをONにする許可をリクエストしています。許可しますか？"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"オペレーターの選択"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"ネットワークオペレーターを選択します"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日付と時刻"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"日付と時刻の設定"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"日時の設定"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"日付、時刻、タイムゾーンの設定"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"日付と時刻の自動設定"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"ネットワークから提供された時刻を使用します"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"現在地、画面のロック解除、認証情報ストレージのロックを設定します"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"パスワード"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"端末の暗号化"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"デバイス内データを暗号化"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"デバイス内データを暗号化"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"端末のロック解除PINまたはパスワードの設定が必要です"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"端末のロック解除PINまたはパスワードの設定が必要です"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"暗号化されています"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"アカウント、設定、ダウンロード済みアプリケーションとそのデータ、メディア、その他のファイルを暗号化できます。携帯端末を暗号化すると、その後はデータを初期化して端末内の全データを削除しない限り暗号化を解除できません。"\n\n"暗号化の処理には最大で1時間かかることがあります。暗号化を開始する前に電池に充電し、暗号化が完了するまで携帯端末を電源に接続しておく必要があります。暗号化処理が途中で中断されると、データの一部または全部が失われます。"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"アカウント、設定、ダウンロード済みアプリケーションとそのデータ、メディア、その他のファイルを暗号化できます。携帯端末を暗号化すると、その後はデータを初期化して端末内の全データを削除しない限り暗号化を解除できません。"\n\n"暗号化の処理には最大で1時間かかることがあります。暗号化を開始する前に電池に充電し、暗号化が完了するまで携帯端末を電源に接続しておく必要があります。暗号化処理が途中で中断されると、データの一部または全部が失われます。"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"タブレットを暗号化"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"携帯端末を暗号化"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"暗号化の確認"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"ユーザーデータを暗号化しますか？この操作は取り消すことができません。処理を途中で中断するとデータが失われます。暗号化の処理には最大で1時間かかることがあります。"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"ユーザーデータを暗号化しますか？この操作は取り消すことができません。処理を途中で中断するとデータが失われます。暗号化の処理には最大で1時間かかることがあります。"</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"暗号化しています"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"^1秒後にやり直してください。"</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"画面ロックの設定"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"画面ロックの設定"</string>
@@ -382,7 +377,7 @@
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"BluetoothをONにする"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth設定"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth設定"</string>
-    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"端末の名前、接続や検出設定"</string>
+    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"接続、端末名、検出の許可を設定する"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetoothのペア設定リクエスト"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」とペア設定するPINを入力してください（0000か1234を試してください）。Bluetoothデバイスと同じPINの入力が必要になる場合があります。"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="8301499416158195044">\n"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」とペア設定するためのパスキーを入力してください。"</string>
@@ -443,13 +438,13 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"音楽とメディア"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"設定を保存"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"タグの読み取りと交換にNFCを使用"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"タグの読み取りと交換にNFCを使用する"</string>
     <string name="nfc_toggle_error" msgid="2233172102497535522">"エラーが発生しました。"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-FiをONにする"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi設定"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi設定"</string>
-    <string name="wifi_settings_summary" msgid="668767638556052820">"ワイヤレスアクセスポイントの設定"</string>
+    <string name="wifi_settings_summary" msgid="668767638556052820">"ワイヤレスアクセスポイントを設定する"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"ONにしています..."</string>
     <string name="wifi_stopping" msgid="5952909472548218348">"OFFにしています..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"エラー"</string>
@@ -532,7 +527,7 @@
     <string name="display_settings_title" msgid="2378894265964357591">"画面"</string>
     <string name="sound_settings" msgid="5007659014828162881">"音の設定"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"マナーモード"</string>
-    <string name="silent_mode_summary" msgid="3309650676072917899">"音楽、動画メディア、アラーム以外は消音"</string>
+    <string name="silent_mode_summary" msgid="3309650676072917899">"音楽、動画メディア、アラーム以外は消音する"</string>
     <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"音楽と動画メディア以外は消音"</string>
     <string name="ringtone_title" msgid="7037881886694206550">"通話着信音"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"ストレージの設定"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USBストレージのマウントを解除し、使用できるストレージを表示"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SDカードの取り外し、空き容量の表示"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"電話番号"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"電話番号"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRLバージョン"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"内部ストレージ"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USBストレージ"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SDカード"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"空き容量"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"合計容量"</string>
+    <string name="memory_available" msgid="5052397223077021181">"空き容量"</string>
+    <string name="memory_size" msgid="5458889090691922288">"合計容量"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"計算中..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"アプリケーションの使用状況"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"メディアの使用状況"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"アプリケーション"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"メディア"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"共有ストレージのマウントを解除"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SDカードのマウント解除"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"内部USBストレージのマウント解除"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"この操作を行うと、以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます:"\n\n<li>"Googleアカウント"</li>\n<li>"システムやアプリケーションのデータと設定"</li>\n<li>"ダウンロードしたアプリケーション"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"この操作を行うと、以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます:"\n\n<li>"Googleアカウント"</li>\n<li>"システムやアプリケーションのデータと設定"</li>\n<li>"ダウンロードしたアプリケーション"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"以下のアカウントにログインしています:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音楽"</li>\n<li>"画像"</li>\n<li>"他のユーザーデータ"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"音楽、写真、その他のユーザーデータも消去する場合は"<b>"USBストレージ"</b>"を消去する必要があります。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"音楽、写真などのユーザーデータも消去するためには、"<b>"SDカード"</b>"を消去する必要があります。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USBストレージ内データの消去"</string>
@@ -802,7 +796,7 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>のテザリングを解除します。"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ヘルプ"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"モバイルネットワーク"</string>
-    <string name="network_settings_summary" msgid="5149750850846813553">"ローミング、ネットワーク、APN設定"</string>
+    <string name="network_settings_summary" msgid="5149750850846813553">"ローミング、ネットワーク、APNを設定する"</string>
     <string name="location_title" msgid="1029961368397484576">"現在地"</string>
     <string name="location_network_based" msgid="8815705866861993344">"無線ネットワークを使用"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"無線ネットワーク使用のアプリケーション（地図など）で位置を表示する"</string>
@@ -846,7 +840,7 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"パスワードが設定されました"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PINが設定されました"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"パターンが設定されました"</string>
-    <string name="lock_settings_title" msgid="8943058958424073651">"ロック画面"</string>
+    <string name="lock_settings_title" msgid="8943058958424073651">"画面のロック"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"パターンの変更"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"ロック解除PINを変更"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"現在のパターンを入力"</string>
@@ -993,7 +987,7 @@
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: 現在使用中です。管理するには[設定]をタップしてください。"</string>
     <string name="main_running_process_description" msgid="929204645380391397">"使用中のメインプロセスです。"</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"サービス<xliff:g id="COMP_NAME">%1$s</xliff:g>は使用中です。"</string>
-    <string name="process_provider_in_use_description" msgid="5586603325677678940">"プロバイダ<xliff:g id="COMP_NAME">%1$s</xliff:g>は使用中です。"</string>
+    <string name="process_provider_in_use_description" msgid="5586603325677678940">"<xliff:g id="COMP_NAME">%1$s</xliff:g>プロバイダは使用中です。"</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"システムサービスを停止しますか？"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"このシステムサービスを停止してもよろしいですか？停止すると、電源を一旦OFFにして再度ONにするまで、タブレットの一部の機能が正常に動作しなくなる場合があります。"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"このシステムサービスを停止してよろしいですか？停止すると、電源を一旦OFFにして再度ONにするまで、端末の一部の機能が正常に動作しなくなる場合があります。"</string>
@@ -1288,40 +1282,33 @@
     <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g>は有効です"</string>
     <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g>は無効です"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN設定"</string>
-    <string name="vpn_settings_summary" msgid="8849924181594963972">"VPNの設定と管理"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"VPNを設定および管理する"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"（変更なし）"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"（未設定）"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"認証情報ストレージ"</string>
     <string name="credentials_access" msgid="4843187230913860492">"安全な認証情報の使用"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"安全な証明書と他の認証情報へのアクセスをアプリケーションに許可する"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"USBストレージからインストール"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"SDカードからインストール"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"USBストレージから証明書をインストールする"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"証明書をSDカードからインストールする"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"パスワードの設定"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"認証情報ストレージパスワードを設定または変更する"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"ストレージの消去"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"認証情報ストレージのすべてのコンテンツを消去してパスワードをリセットする"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"認証ストレージのパスワードを設定または変更する"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"認証ストレージの消去"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"すべてのコンテンツを削除してパスワードをリセットする"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"パスワードを入力する"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"認証情報ストレージのパスワードを入力します。"</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"認証ストレージのパスワードを入力してください。"</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"認証情報ストレージのパスワードを設定します。パスワードは8文字以上で指定します。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"現在のパスワード:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"新しいパスワード:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"新しいパスワードの確認:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"すべての認証情報を削除して認証情報ストレージパスワードをリセットしてもよろしいですか？"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"コンテンツはすべて削除され、パスワードはリセットされます。操作を実行してもよろしいですか？"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"パスワードが一致しません。"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"パスワードを8文字以上で入力してください。"</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"正しいパスワードを入力してください。"</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"正しいパスワードを入力してください。パスワードの入力にもう1回失敗すると、認証情報ストレージが消去されます。"</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"認証情報ストレージが消去されました。"</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"パスワードが正しくありません。"</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"パスワードが正しくありません。あと1回失敗すると、認証情報ストレージが消去されます。"</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"パスワードが正しくありません。あと<xliff:g id="NUMBER">%1$d</xliff:g>回失敗すると、認証情報ストレージが消去されます。"</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"認証情報ストレージを消去"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"認証情報ストレージが有効になりました。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急時の音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"緊急通報時の動作を設定します"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"接続中..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"次の手順に進む"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAPはサポートされていません"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"セットアップ中にEAP Wi-Fi接続は設定できません。セットアップ後に、[設定]の[無線とネットワーク]で設定できます。"</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"設定時にはEAP Wi-Fi接続を設定できません。設定の完了後に[設定]の["<b>"無線とネットワーク"</b>"]で設定することができます。"</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"接続には数分かかることがあります..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"設定を続けるには["<b>"次へ"</b>"]をタップします。"\n\n"別のWi-Fiネットワークに接続するには["<b>"戻る"</b>"]をタップします。"</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"同期設定"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"現在同期で問題が発生しています。しばらくお待ちください。"</string>
     <string name="add_account_label" msgid="7811707265834013767">"アカウントを追加"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"このアイテムの同期は現在無効になっています。設定を変更するには、バックグラウンドデータと自動同期を一時的にONにします。"</string>
     <string name="enter_password" msgid="3268224850821675915">"ストレージの暗号化を解除するパスワードを入力してください"</string>
     <string name="try_again" msgid="5904121494468643129">"もう一度お試しください"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"サービスはビジーです。もう一度お試しください。"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0b400e7..de6845c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth 페어링 요청"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"페어링 요청"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 페어링하려면 선택"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"받은 파일 표시"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"블루투스를 통해 받은 파일 목록 표시"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth 장치 선택기"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"블루투스 권한 요청"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"애플리케이션에서 블루투스 사용 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
@@ -228,7 +226,7 @@
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"무선 연결을 끊는 중..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"무선 연결 사용 중..."</string>
     <string name="radio_controls_title" msgid="5868688473587168882">"무선 및 네트워크"</string>
-    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"무선 및 네트워크"</string>
+    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"무선 및 네트워크 설정"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi, 블루투스, 비행기 모드, 모바일 네트워크 및 VPN 관리"</string>
     <string name="roaming" msgid="3596055926335478572">"데이터 로밍"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"로밍 시 데이터 서비스에 연결"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"운영자 선택"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"네트워크 운영자 선택"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"날짜 및 시간"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"날짜 및 시간 설정"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"날짜 및 시간 설정"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"날짜, 시간, 표준시간대 및 형식 설정"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"날짜/시간 자동설정"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"인터넷 시간 사용"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"내 위치, 화면 잠금해제, SIM 카드 잠금, 자격증명 저장소 잠금 설정"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"내 위치, 화면 잠금해제, 자격증명 저장소 잠금 설정"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"비밀번호"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"기기 암호화"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"기기 데이터 암호화"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"기기 데이터 암호화"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"기기 잠금해제 PIN 또는 비밀번호를 설정해야 합니다."</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"기기 잠금해제 PIN 또는 비밀번호를 설정해야 합니다."</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"암호화됨"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"계정, 설정, 다운로드된 애플리케이션과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 휴대전화를 암호화하면 기본값 데이터 재설정을 수행하여 휴대전화의 모든 데이터를 삭제해야만 암호화를 해제할 수 있습니다."\n\n"암호화에는 최대 1시간이 걸릴 수 있습니다. 충전된 배터리로 암호화를 시작하고 완료될 때까지 전화의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터 일부 또는 전부를 잃게 됩니다."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"계정, 설정, 다운로드된 애플리케이션과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 휴대전화를 암호화하면 기본값 데이터 재설정을 수행하여 휴대전화의 모든 데이터를 삭제해야만 암호화를 해제할 수 있습니다."\n\n"암호화에는 최대 1시간이 걸릴 수 있습니다. 충전된 배터리로 암호화를 시작하고 완료될 때까지 전화의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터 일부 또는 전부를 잃게 됩니다."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"태블릿 암호화"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"휴대전화 암호화"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"암호화 확인"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"사용자 데이터를 암호화하시겠습니까? 이 작업은 되돌릴 수 없으며 중단하면 데이터를 잃게 됩니다. 암호화에는 최대 1시간이 걸릴 수 있습니다."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"사용자 데이터를 암호화하시겠습니까? 이 작업은 되돌릴 수 없으며 중단하면 데이터를 잃게 됩니다. 암호화에는 최대 1시간이 걸릴 수 있습니다."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"암호화 중"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"^1초 후에 다시 시도하세요."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"화면 잠금 구성"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"화면 잠금 구성"</string>
@@ -388,7 +383,7 @@
     <string name="bluetooth_enter_passkey_msg" msgid="8301499416158195044">\n"\'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'와(과) 페어링하려면 연결 코드를 입력하세요."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"\'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'와(과) 페어링하려면 다음 패스키가 표시 중인지 확인합니다. <xliff:g id="PASSKEY">%2$s</xliff:g>"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"에서 페어링하고자 합니다."</string>
-    <string name="bluetooth_display_passkey_pin_msg" msgid="9139892462102104755">"페어링하려면 \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'에서 \'<xliff:g id="PASSKEY">%2$s</xliff:g>\'을(를) 입력하고 Enter 키를 누르세요."</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="9139892462102104755">"페어링하려면 \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'에서 \'<xliff:g id="PASSKEY">%2$s</xliff:g>\'를 입력하고 Enter 키를 누르세요."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"페어링"</string>
     <string name="bluetooth_pairing_decline" msgid="930951069988011471">"페어링 안함"</string>
     <string name="bluetooth_remote_device" msgid="2406662802908395389">"블루투스 장치"</string>
@@ -402,7 +397,7 @@
     <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"주변 기기 찾기"</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="3133019331974936204">"기기 감지"</string>
+    <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"감지된 기기"</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>
@@ -417,7 +412,7 @@
     <string name="bluetooth_profile_pan" msgid="4225813400648547154">"테더링"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 미디어 오디오의 연결이 끊어집니다."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 핸즈프리 오디오의 연결이 끊어집니다."</string>
-    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 입력 기기의 연결이 끊어집니다."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 입력 장치의 연결이 끊어집니다."</string>
     <string name="bluetooth_disconnect_pan_profile" msgid="877883150720888525">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>의 테더링 연결이 끊어집니다."</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 옵션"</string>
     <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"기기 작동"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"저장소 설정"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB 저장소를 마운트 해제하고 사용 가능한 저장공간을 봅니다."</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD 카드 마운트 해제, 사용 가능한 저장공간 보기"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"내 휴대전화 번호"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"내 휴대전화 번호"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL 버전"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"내부 저장소"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB 저장소"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD 카드"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"사용 가능한 저장공간"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"총 공간"</string>
+    <string name="memory_available" msgid="5052397223077021181">"사용 가능"</string>
+    <string name="memory_size" msgid="5458889090691922288">"전체"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"계산 중..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"애플리케이션 사용량"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"미디어 사용량"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"애플리케이션"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"미디어"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"공유 저장장치 마운트 해제"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD 카드 마운트 해제"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"내부 USB 저장소 마운트 해제"</string>
@@ -731,14 +726,13 @@
     <string name="restore_default_apn" msgid="2724583218635739913">"기본 APN 설정 복원 중"</string>
     <string name="menu_restore" msgid="8260067415075573273">"초기화"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"기본 APN 설정을 초기화했습니다."</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"초기화"</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"공장 초기화"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"태블릿의 모든 데이터 지우기"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"휴대전화의 모든 데이터 지우기"</string>
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"이렇게 하면 태블릿의 "<b>"내부 저장소"</b>"("\n\n<li>"Google 계정"</li>\n<li>"시스템과 애플리케이션 데이터 및 설정"</li>\n<li>"다운로드된 애플리케이션"</li>" 포함)에서 모든 데이터가 삭제됩니다."</string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"이렇게 하면 휴대전화의 "<b>"내부 저장소"</b>"("\n\n<li>"Google 계정"</li>\n<li>"시스템과 애플리케이션 데이터 및 설정"</li>\n<li>"다운로드된 애플리케이션"</li>" 포함)에서 모든 데이터가 삭제됩니다."</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"현재 다음 계정에 로그인함:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"음악"</li>\n<li>"사진"</li>\n<li>"기타 사용자 데이터"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"음악이나 사진, 기타 사용자 데이터도 지우려면 "<b>"USB 저장소"</b>"를 삭제해야 합니다."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"음악과 그림 및 기타 사용자 데이터도 삭제하려면 "<b>"SD 카드"</b>"를 지워야 합니다."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB 저장소 지우기"</string>
@@ -750,7 +744,7 @@
     <string name="master_clear_final_desc" msgid="6917971132484622696">"모든 개인 정보와 다운로드한 애플리케이션을 삭제하시겠습니까? 수행한 작업은 취소할 수 없습니다."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"모두 지우기"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"잠금해제 패턴을 그리세요."</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"초기화를 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"공장 초기화를 실행하려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"시스템 지우기 서비스를 사용할 수 없어 재설정을 수행하지 못했습니다."</string>
     <string name="master_clear_confirm_title" msgid="4845794266129586839">"초기화 확인"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB 저장소 지우기"</string>
@@ -997,8 +991,8 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"시스템 서비스를 중지하시겠습니까?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"이 시스템 서비스를 중지하시겠습니까? 중지하면 태블릿의 일부 기능이 올바르게 작동되지 않을 수 있으며 전원을 껐다 켜야 합니다."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"이 시스템 서비스를 중지하시겠습니까? 중지하면 휴대전화의 일부 기능이 올바르게 작동되지 않을 수 있으며 전원을 껐다 켜야 합니다."</string>
-    <string name="language_settings" msgid="5292716747264442359">"언어 및 입력"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"언어 및 입력"</string>
+    <string name="language_settings" msgid="5292716747264442359">"언어 및 키보드 설정"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"언어 및 키보드 설정"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"언어 설정"</string>
     <string name="keyboard_settings_category" msgid="7060453865544070642">"키보드 설정"</string>
     <string name="phone_language" msgid="1165758957501090679">"언어 선택"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"VPN 설정 및 관리"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(변경 안함)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(설정 안함)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"자격증명 저장소"</string>
     <string name="credentials_access" msgid="4843187230913860492">"보안 자격증명 사용"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"애플리케이션이 보안 인증서 및 다른 자격증명에 액세스 허용"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"USB 저장소에서 설치"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"SD 카드에서 설치"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"USB 저장소에서 인증서 설치"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"SD 카드에서 인증서 설치"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"비밀번호 설정"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"자격증명 저장소 비밀번호를 설정하거나 변경"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"저장소 삭제"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"모든 콘텐츠의 자격증명 저장소 삭제 및 비밀번호 재설정"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"자격증명 저장소에 대한 비밀번호 설정 또는 변경"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"자격증명 삭제"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"콘텐츠를 모두 삭제하고 비밀번호 재설정"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"비밀번호 입력"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"자격증명 저장소 비밀번호를 입력하세요."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"자격증명 저장소에 대한 비밀번호를 입력하세요."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"자격증명 저장소에 대한 비밀번호를 설정하세요. 8자 이상이어야 합니다."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"현재 비밀번호:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"새 비밀번호:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"새 비밀번호 확인:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"모든 자격증명을 삭제하고 자격증명 저장소 비밀번호를 재설정하시겠습니까?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"콘텐츠가 모두 삭제되고 비밀번호가 재설정됩니다. 계속하시겠습니까?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"비밀번호가 일치하지 않습니다."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"비밀번호는 8자 이상이어야 합니다."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"정확한 비밀번호를 입력하세요."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"정확한 비밀번호를 입력하세요. 한 번 더 비밀번호를 잘못 입력하면 자격증명 저장 내용이 삭제됩니다."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"자격증명 저장소가 삭제되었습니다."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"비밀번호가 잘못되었습니다."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"비밀번호가 잘못되었습니다. 한 번 더 실패하면 자격증명 저장소가 지워집니다."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"비밀번호가 잘못되었습니다. <xliff:g id="NUMBER">%1$d</xliff:g>번 더 실패하면 자격증명 저장소가 지워집니다."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"자격증명 저장소가 삭제되었습니다."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"자격증명 저장소를 사용합니다."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"긴급 신호음"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"긴급 통화 중 동작 설정"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"연결 중..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"다음 단계로 넘어가기"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP 지원 안함"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"설정하는 동안 EAP Wi-Fi 연결을 구성할 수 없습니다. 설정한 후에 설정의 무선 &amp; 네트워크에서 구성할 수 있습니다."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"설정하는 동안 EAP Wi-Fi 연결을 구성할 수 없습니다. 설정이 완료되면 \'설정\'의 "<b>"무선 및 네트워크"</b>"에서 연결을 구성할 수 있습니다."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"연결에 몇 분 정도 걸릴 수 있습니다."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"설정을 계속하려면 "<b>"다음"</b>"을 터치하세요."\n\n"다른 Wi-Fi 네트워크에 연결하려면 "<b>"뒤로"</b>"를 터치하세요."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"동기화 설정"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"현재 동기화에 문제가 발생했습니다. 잠시 후에 다시 실행됩니다."</string>
     <string name="add_account_label" msgid="7811707265834013767">"계정 추가"</string>
@@ -1405,7 +1390,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"캘린더"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"연락처"</string>
-    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Google Sync에 오신 것을 환영합니다."</font>" "\n"Google Sync는 사용자가 어디에서든지 연락처, 일정 등에 액세스할 수 있도록 데이터를 동기화하는 Google 서비스입니다."</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Google 동기화에 오신 것을 환영합니다."</font>" "\n"Google 동기화는 사용자가 어디에서든지 연락처, 일정 등에 액세스할 수 있도록 데이터를 동기화하는 Google 서비스입니다."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"애플리케이션 동기화 설정"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"데이터 및 동기화"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"비밀번호 변경"</string>
@@ -1416,14 +1401,13 @@
     <string name="really_remove_account_title" msgid="6574643117748564960">"계정 삭제"</string>
     <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"계정을 삭제하시겠습니까? 삭제하면 휴대전화의 메시지, 연락처 및 다른 데이터가 모두 지워집니다. "\n"계속하시겠습니까?"</string>
     <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"계정을 삭제하시겠습니까? 삭제하면 휴대전화의 메시지, 연락처 및 다른 데이터가 모두 지워집니다. "\n"계속하시겠습니까?"</string>
-    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"일부 애플리케이션의 경우 이 계정이 필요합니다. 태블릿을 기본값으로 재설정해야 계정을 삭제할 수 있으며 이 경우 모든 개인 데이터가 삭제됩니다. 개인정보 보호 아래의 설정 애플리케이션에서 재설정할 수 있습니다."</string>
-    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"일부 애플리케이션의 경우 이 계정이 필요합니다. 휴대전화를 기본값으로 재설정해야 계정을 삭제할 수 있으며 이 경우 모든 개인 데이터가 삭제됩니다. 개인정보 보호 아래의 설정 애플리케이션에서 재설정할 수 있습니다."</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"일부 애플리케이션의 경우 이 계정이 필요합니다. 태블릿을 공장 초기화해야 계정을 삭제할 수 있으며 이 경우 모든 개인 데이터가 삭제됩니다. \'개인정보 보호\' 아래의 \'설정\' 애플리케이션에서 재설정할 수 있습니다."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"일부 애플리케이션의 경우 이 계정이 필요합니다. 휴대전화를 공장 초기화해야 계정을 삭제할 수 있으며 이 경우 모든 개인 데이터가 삭제됩니다. \'개인정보 보호\' 아래의 \'설정\' 애플리케이션에서 재설정할 수 있습니다."</string>
     <string name="provider_label" msgid="7724593781904508866">"구독정보 푸시"</string>
     <string name="sync_item_title" msgid="1931551540462877488">"<xliff:g id="AUTHORITY">%s</xliff:g> 동기화"</string>
     <string name="cant_sync_dialog_title" msgid="7185199796123573317">"수동으로 동기화할 수 없음"</string>
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"현재 이 항목에 대해 동기화를 사용할 수 없습니다. 환경설정을 변경하려면 백그라운드 데이터 및 자동 동기화를 일시적으로 사용하도록 설정하세요."</string>
     <string name="enter_password" msgid="3268224850821675915">"저장소 암호를 해독하려면 비밀번호를 입력하세요."</string>
     <string name="try_again" msgid="5904121494468643129">"죄송합니다. 다시 시도해 주세요."</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"서비스를 사용할 수 없습니다. 다시 시도해 주세요."</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 3c7c861..9a864cd 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -266,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Nustatyti mano vietą, ekrano atrakinimą, SIM kortelės užraktą, įgaliojimų saugyklos užraktą"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nustatyti mano vietą, ekrano atrakinimą, įgaliojimų saugyklos užraktą"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Slaptažodžiai"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Įrenginio šifravimas"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifruoti įrenginio duomenis"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifruoti įrenginio duomenis"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Reikia, kad nustatytumėte įrenginio atrakinimo PIN kodą arba slaptažodį"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Reikia, kad nustatytumėte įrenginio atrakinimo PIN kodą arba slaptažodį"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifruotas"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Galite šifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Užšifravę planšetinį kompiuterį, šifravimą panaikinti galėsite tik atlikę gamyklinių duomenų nustatymą iš naujo, ištrindami visus planšetinio kompiuterio duomenis."\n\n"Šifravimas trunka iki valandos. Pradedant šifravimą akumuliatorius turi būti įkrautas ir telefoną reikia laikyti įjungtą į tinklą, kol šifravimas bus užbaigtas. Jei nutrauksite šifravimo procesą, prarasite dalį duomenų ar visus duomenis."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Galite šifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Užšifravę planšetinį kompiuterį, šifravimą panaikinti galėsite tik atlikę gamyklinių duomenų nustatymą iš naujo, ištrindami visus planšetinio kompiuterio duomenis."\n\n"Šifravimas trunka iki valandos. Pradedant šifravimą akumuliatorius turi būti įkrautas ir telefoną reikia laikyti įjungtą į tinklą, kol šifravimas bus užbaigtas. Jei nutrauksite šifravimo procesą, prarasite dalį duomenų ar visus duomenis."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifruoti planšetinį kompiuterį"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifruoti telefoną"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Patvirtinti šifravimą"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Šifruoti naudotojo duomenis? Šios operacijos anuliuoti negalima, o ją nutraukus bus prarasti duomenys! Šifravimas gali trukti iki valandos."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Šifruoti naudotojo duomenis? Šios operacijos anuliuoti negalima, o ją nutraukus bus prarasti duomenys! Šifravimas gali trukti iki valandos."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifruojama"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Bandyti dar kartą po ^1 sek."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Konfig. užrak. ekraną"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Konfig. užrak. ekraną"</string>
@@ -661,8 +658,8 @@
     <string name="internal_memory" msgid="9129595691484260784">"Vidinė atmint."</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB atmintinė"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD kortelė"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Galima vieta"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Visa vieta"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Pasiekiama"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Iš viso"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Skaičiuojama..."</string>
     <string name="memory_apps_usage" msgid="9079237985722858506">"Programos"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medija"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index afbf2e2..0d9c715 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -266,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Manas atrašanās vietas, ekrāna atbloķēšanas, SIM kartes bloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Manas atrašanās vietas, ekrāna atbloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Paroles"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Ierīces šifrēšana"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Datu šifrēšana ierīcē"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Datu šifrēšana ierīcē"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Jāiestata ierīces atbloķēšanas PIN kods vai parole."</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Jāiestata ierīces atbloķēšanas PIN kods vai parole."</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrēts"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Varat šifrēt savus kontus, iestatījumus, lejupielādētās lietojumprogrammas un to datus, kā arī multividi un citus failus. Kad tālrunis ir šifrēts, to var atšifrēt, tikai veicot atiestatīšanu uz rūpnīcas datiem, dzēšot visus tālrunī esošos datus."\n\n"Šifrēšana var ilgt pat stundu. Vispirms ir jāuzlādē akumulators, un tālrunim ir jābūt pievienotam barošanas avotam, līdz šifrēšana būs pabeigta. Ja šifrēšanas process tiks pārtraukts, zaudēsiet daļu no datiem vai visus datus."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Varat šifrēt savus kontus, iestatījumus, lejupielādētās lietojumprogrammas un to datus, kā arī multividi un citus failus. Kad tālrunis ir šifrēts, to var atšifrēt, tikai veicot atiestatīšanu uz rūpnīcas datiem, dzēšot visus tālrunī esošos datus."\n\n"Šifrēšana var ilgt pat stundu. Vispirms ir jāuzlādē akumulators, un tālrunim ir jābūt pievienotam barošanas avotam, līdz šifrēšana būs pabeigta. Ja šifrēšanas process tiks pārtraukts, zaudēsiet daļu no datiem vai visus datus."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrēt planšetdatoru"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrēt tālruni"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Šifrēšanas apstiprinājums"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Vai šifrēt lietotāja datus? Šo darbību nevarēs atcelt, un, to pārtraucot, var tikt zaudēti dati. Šifrēšana var ilgt pat stundu."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Vai šifrēt lietotāja datus? Šo darbību nevarēs atcelt, un, to pārtraucot, var tikt zaudēti dati. Šifrēšana var ilgt pat stundu."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifrēšana"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Mēģiniet vēlreiz pēc ^1 sekundes(-ēm)."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Konfigurēt bloķ. ekr."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Konfigurēt bloķ. ekr."</string>
@@ -661,8 +658,8 @@
     <string name="internal_memory" msgid="9129595691484260784">"Iekšējā krātuve"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB krātuve"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD karte"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Pieejamā vieta"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Kopējā vieta"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Pieejama"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Kopā"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Notiek aprēķināšana..."</string>
     <string name="memory_apps_usage" msgid="9079237985722858506">"Lietojumprogrammas"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multivide"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d726268..42c8b6d 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -266,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Plassering, skjermlås, SIM-kort-lås"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angi Min posisjon, lås opp skjerm, lås påloggingsopplysninger"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passord"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enhetskryptering"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Krypter data på enheten"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Krypter data på enheten"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Krever at du angir en personlig opplåsingskode eler passord for enheten"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Krever at du angir en personlig opplåsingskode eler passord for enheten"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Kryptert"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Du kan kryptere dine kontoer, innstillinger, nedlastede programmer og tilknyttede data, medieinnhold og andre filer. Når du har kryptert telefonen, kan du ikke dekryptere det uten å gjennomføre en tilbakestilling til fabrikkstandard, noe som sletter alle data på telefonen."\n\n"Kryptering tar inntil én time. Batteriet må være ladet, og telefonen må være tilkoblet strøm inntil krypteringen er fullført. Hvis du forstyrrer krypteringsprosessen, mister du deler av eller alle dataene."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Du kan kryptere dine kontoer, innstillinger, nedlastede programmer og tilknyttede data, medieinnhold og andre filer. Når du har kryptert telefonen, kan du ikke dekryptere det uten å gjennomføre en tilbakestilling til fabrikkstandard, noe som sletter alle data på telefonen."\n\n"Kryptering tar inntil én time. Batteriet må være ladet, og telefonen må være tilkoblet strøm inntil krypteringen er fullført. Hvis du forstyrrer krypteringsprosessen, mister du deler av eller alle dataene."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krypter nettbrett"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krypter telefon"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Bekreft kryptering"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Vil du kryptere brukerdata? Denne handlingen er ikke reversibel, og kan ikke forstyrres uten tap av data! Krypteringen kan ta inntil én time."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Vil du kryptere brukerdata? Denne handlingen er ikke reversibel, og kan ikke forstyrres uten tap av data! Krypteringen kan ta inntil én time."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Kryptering"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Prøv på nytt om ^1 sekunder."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Konfigurere låseskjermen"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Konfigurer låseskjermen"</string>
@@ -661,8 +658,8 @@
     <string name="internal_memory" msgid="9129595691484260784">"Intern lagring"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-lagring"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Minnekort"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Tilgjengelig plass"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Total plass"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Tilgjengelig"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Totalt"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Beregner …"</string>
     <string name="memory_apps_usage" msgid="9079237985722858506">"Programmer"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medier"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4ffd0e6..f0c51cb 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth-koppelingsverzoek"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Koppelingsverzoek"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Selecteer dit om te koppelen met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Ontvangen bestanden weergeven"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Lijst met via Bluetooth ontvangen bestanden weergeven"</string>
     <string name="device_picker" msgid="8721012448931226323">"Apparaatkiezer van Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Machtigingsverzoek voor Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Een toepassing vraagt toestemming Bluetooth in te schakelen. Wilt u dit toestaan?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Operator selecteren"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Een mobiele provider selecteren"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum en tijd"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Datum en tijd instellen"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Datum en tijd instellen"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Datum, tijd, tijdzone en notaties instellen"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Autom. tijd en datum"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Netwerktijd gebruiken"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Mijn locatie\', schermontgrendeling, SIM- en referentieopslagvergrendeling instellen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"\'Mijn locatie\' instellen, scherm ontgrendelen, opslag van referenties vergrendelen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Wachtwoorden"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Apparaatcodering"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Gegevens op het apparaat coderen"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Gegevens op het apparaat coderen"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"U moet een PIN-code of wachtwoord instellen om het apparaat te ontgrendelen"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"U moet een PIN-code of wachtwoord instellen om het apparaat te ontgrendelen"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Gecodeerd"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"U kunt uw accounts, instellingen, gedownloade toepassingen en de bijbehorende gegevens, media en andere bestanden coderen (encrypten). Zodra u uw telefoon codeert, kunt u deze codering alleen ongedaan maken door het apparaat terug te zetten op de fabrieksinstellingen, waardoor alle gegevens op uw telefoon worden gewist."\n\n"Het coderen kan een uur duren. U moet beginnen met een opgeladen accu en uw telefoon hebben aangesloten op de oplader totdat de codering is voltooid. Als u het coderingsproces onderbreekt, kunt u uw gegevens gedeeltelijk of volledig kwijtraken."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"U kunt uw accounts, instellingen, gedownloade toepassingen en de bijbehorende gegevens, media en andere bestanden coderen (encrypten). Zodra u uw telefoon codeert, kunt u deze codering alleen ongedaan maken door het apparaat terug te zetten op de fabrieksinstellingen, waardoor alle gegevens op uw telefoon worden gewist."\n\n"Het coderen kan een uur duren. U moet beginnen met een opgeladen accu en uw telefoon hebben aangesloten op de oplader totdat de codering is voltooid. Als u het coderingsproces onderbreekt, kunt u uw gegevens gedeeltelijk of volledig kwijtraken."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tablet coderen"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefoon coderen"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Codering bevestigen"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Wilt u uw gebruikersgegevens coderen? Deze bewerking kan niet worden teruggedraaid en kan niet zonder gegevensverlies worden onderbroken! Het coderen van uw gegevens kan een uur duren."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Wilt u uw gebruikersgegevens coderen? Deze bewerking kan niet worden teruggedraaid en kan niet zonder gegevensverlies worden onderbroken! Het coderen van uw gegevens kan een uur duren."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Coderen"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Probeer het over ^1 seconden opnieuw."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Vergr. scherm inst."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Vergr. scherm inst."</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Instellingen voor opslag"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB-opslag ontkoppelen, beschikbare opslag weergeven"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD-kaart ontkoppelen, beschikbare opslagruimte weergeven"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Mijn telefoonnummer"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Mijn telefoonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL-versie"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Interne opslag"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-opslag"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kaart"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Beschikbare ruimte"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Totale ruimte"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Beschikbaar"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Totaal"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Berekenen…"</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Gebruik door toepassingen"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Mediagebruik"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Toepassingen"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Gedeelde opslag ontkoppelen"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-kaart ontkoppelen"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Interne USB-opslag ontkoppelen"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw tablet gewist, waaronder:"\n\n<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de toepassingen"</li>\n<li>"Gedownloade toepassingen"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw telefoon gewist, waaronder:"\n\n<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de toepassingen"</li>\n<li>"Gedownloade toepassingen"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"U bent momenteel aangemeld bij de volgende accounts:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muziek"</li>\n<li>"Foto\'s"</li>\n<li>"Andere gebruikersgegevens"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Als u ook muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"USB-opslag"</b>" worden gewist."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Als u ook muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"SD-kaart"</b>" worden gewist."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB-opslag wissen"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"VPN\'s (Virtual Private Networks) instellen en beheren"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(ongewijzigd)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(niet ingesteld)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Opslag van referenties"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Beveiligingsreferenties"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Toepassingen mogen veilige certificaten en andere referenties openen"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Installeren uit USB-opslag"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Installeren van SD-kaart"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Certificaten van USB-opslag installeren"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Certificaten installeren vanaf SD-kaart"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Wachtwoord instellen"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Het wachtwoord voor de opslag van referenties instellen"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Opslag wissen"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Referentieopslag voor inhoud wissen en wachtwoord opnieuw instellen"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Het wachtwoord voor de opslag van referenties instellen of wijzigen"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Referenties wissen"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Alle inhoud verwijderen en het wachtwoord opnieuw instellen"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Voer het wachtwoord in"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Geef het wachtwoord voor de opslag van referenties op."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Geef het wachtwoord voor de opslag van referenties op."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Stel het wachtwoord voor de opslag van referenties in. Het wachtwoord moet bestaan uit ten minste acht tekens."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Huidig wachtwoord:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Nieuw wachtwoord:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Nieuw wachtwoord bevestigen:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Weet u zeker dat u alle referenties wilt verwijderen en het wachtwoord voor de opslag van referenties opnieuw wilt instellen?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Alle inhoud wordt verwijderd en het wachtwoord wordt opnieuw ingesteld. Weet u het zeker?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"De wachtwoorden komen niet overeen."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Het wachtwoord moet uit ten minste 8 tekens bestaan."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Voer het juiste wachtwoord in."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Voer het juiste wachtwoord in. U kunt nog één keer proberen het juiste wachtwoord in te voeren voordat de opgeslagen referenties worden verwijderd."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"De opslag van referenties is gewist."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Onjuist wachtwoord."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Onjuist wachtwoord. U heeft nog één poging voordat de opslag van referenties wordt gewist."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Onjuist wachtwoord. U heeft nog <xliff:g id="NUMBER">%1$d</xliff:g> pogingen voordat de opslag van referenties wordt gewist."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Opslag van referenties is gewist."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"De opslag van referenties is ingeschakeld."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Toon voor noodoproep"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Gedrag bij noodoproepen instellen"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Verbinding maken..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Doorgaan naar de volgende stap"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP wordt niet ondersteund"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"U kunt een Wi-Fi-verbinding van het type EAP niet configureren tijdens het instellen. U kunt dit na het instellen doen via \'Instellingen\' onder \'Draadloos en netwerken\'."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"U kunt geen Wi-Fi-verbinding van het type EAP configureren tijdens de configuratie. Na de configuratie kunt u dit doen via \'Instellingen\', bij "<b>"Draadloos en netwerken"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Verbinding maken kan enkele minuten duren..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Raak "<b>"Volgende"</b>" aan om door te gaan met de configuratie."\n\n"Raak "<b>"Terug"</b>" aan om verbinding te maken met een ander Wi-Fi-netwerk."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Synchronisatie-instellingen"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Er zijn momenteel problemen met de synchronisatie. Synchronisatie wordt snel opnieuw uitgevoerd."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Account toevoegen"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Synchroniseren is op dit moment uitgeschakeld voor dit item. Als u uw voorkeuren wilt wijzigen, schakelt u achtergrondgegevens en automatisch synchroniseren tijdelijk in."</string>
     <string name="enter_password" msgid="3268224850821675915">"Geef een wachtwoord op om de opslag te decoderen"</string>
     <string name="try_again" msgid="5904121494468643129">"Probeer het opnieuw"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Service bezet, probeer het opnieuw"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c5ea3e2..b137bfe 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Żądanie parowania Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Żądanie parowania"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Wybierz, aby sparować z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Pokazuj odebrane pliki"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Pokazuj listę plików odebranych za pomocą Bluetooth"</string>
     <string name="device_picker" msgid="8721012448931226323">"Selektor urządzenia Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Prośba o pozwolenie na włączenie modułu Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Aplikacja prosi o pozwolenie na włączenie modułu Bluetooth. Czy chcesz na to zezwolić?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Wybór operatora"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Wybierz operatora sieci"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data i godzina"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Ustaw datę i godzinę"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Ustaw datę i godzinę"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Ustaw format daty, godziny i strefę czasową"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Automatyczna data i godzina"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Użyj czasu podanego przez sieć"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę karty SIM, blokadę magazynu danych logowania."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę magazynu danych uwierzytelniania"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hasła"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Szyfrowanie urządzenia"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Zaszyfruj dane na urządzeniu"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Zaszyfruj dane na urządzeniu"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Wymaga ustawienia kodu PIN lub hasła do odblokowania urządzenia"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Wymaga ustawienia kodu PIN lub hasła do odblokowania urządzenia"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Zaszyfrowane"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi, pliki multimedialne i inne pliki. Po zaszyfrowaniu telefonu jedynym sposobem na jego odszyfrowanie jest przywrócenie danych fabrycznych, co jest równoznaczne z usunięciem z telefonu wszystkich danych."\n\n"Proces szyfrowania może trwać do godziny. Przed rozpoczęciem upewnij się, że bateria jest naładowana, a w trakcie szyfrowania nie odłączaj telefonu od zasilania. Przerwanie procesu szyfrowania spowoduje utratę części lub wszystkich danych."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi, pliki multimedialne i inne pliki. Po zaszyfrowaniu telefonu jedynym sposobem na jego odszyfrowanie jest przywrócenie danych fabrycznych, co jest równoznaczne z usunięciem z telefonu wszystkich danych."\n\n"Proces szyfrowania może trwać do godziny. Przed rozpoczęciem upewnij się, że bateria jest naładowana, a w trakcie szyfrowania nie odłączaj telefonu od zasilania. Przerwanie procesu szyfrowania spowoduje utratę części lub wszystkich danych."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Zaszyfruj tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Zaszyfruj telefon"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Potwierdź szyfrowanie"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Zaszyfrować dane użytkownika? Ta operacja jest nieodwracalna, a jej przerwanie grozi utratą danych! Proces szyfrowania może trwać do godziny."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Zaszyfrować dane użytkownika? Ta operacja jest nieodwracalna, a jej przerwanie grozi utratą danych! Proces szyfrowania może trwać do godziny."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Szyfrowanie"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Spróbuj ponownie za ^1 s."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Konfiguruj blokadę ekranu"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Konfiguruj blokadę ekranu"</string>
@@ -417,8 +412,8 @@
     <string name="bluetooth_profile_pan" msgid="4225813400648547154">"Tethering"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączone od funkcji audio multimediów."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączone od zestawu głośnomówiącego."</string>
-    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączone od urządzenia wejściowego."</string>
-    <string name="bluetooth_disconnect_pan_profile" msgid="877883150720888525">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączone z powiązania."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączony od urządzenia wejściowego."</string>
+    <string name="bluetooth_disconnect_pan_profile" msgid="877883150720888525">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączone."</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Opcje urządzenia <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Czynności na urządzeniu"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Połącz"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Ustawienia pamięci"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Odłącz nośnik USB i wyświetl ilość dostępnej pamięci"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Odłącz kartę SD, pokaż ilość dostępnej pamięci w telefonie"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Mój numer telefonu"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Mój numer telefonu"</string>
     <string name="status_min_number" msgid="3519504522179420597">"Numer MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Wersja listy PRL"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Pamięć wewnętrzna"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Nośnik USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Karta SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Dostępna pojemność"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Całkowita pojemność"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Dostępne"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Łącznie"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Obliczanie..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Pamięć na aplikacje"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Wykorzystanie pamięci"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplikacje"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Multimedia"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odłącz pamięć współdzieloną"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Odłącz kartę SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Odłącz wewnętrzny nośnik USB"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Spowoduje to wymazanie wszystkich danych z "<b>"wewnętrznej pamięci"</b>" tabletu, w tym:"\n\n<li>"danych konta Google,"</li>\n<li>"danych i ustawień systemu oraz aplikacji,"</li>\n<li>"pobranych aplikacji."</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Spowoduje to wymazanie wszystkich danych z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:"\n\n<li>"danych konta Google,"</li>\n<li>"danych i ustawień systemu oraz aplikacji,"</li>\n<li>"pobranych aplikacji."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Zalogowano się na następujące konta:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzyka"</li>\n<li>"Zdjęcia"</li>\n<li>"Inne dane użytkownika"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Aby usunąć również muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"nośnik USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Jeśli chcesz usunąć również muzykę, zdjęcia i inne dane użytkownika, konieczne będzie wymazanie zawartości "<b>"karty SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Wyczyść nośnik USB"</string>
@@ -997,8 +991,8 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Czy zatrzymać usługę systemową?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Czy na pewno chcesz zatrzymać tę usługę systemową? Jeśli tak, niektóre funkcje tabletu mogą przestać poprawnie działać do chwili jego wyłączenia i ponownego włączenia."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Czy na pewno chcesz zatrzymać tę usługę systemową? Jeśli tak, niektóre funkcje telefonu mogą przestać poprawnie działać do chwili jego wyłączenia i ponownego włączenia."</string>
-    <string name="language_settings" msgid="5292716747264442359">"Język i urządzenie wejściowe"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Język i urządzenie wejściowe"</string>
+    <string name="language_settings" msgid="5292716747264442359">"Język i wprowadzanie danych"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Język i wprowadzanie danych"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Ustawienia języka"</string>
     <string name="keyboard_settings_category" msgid="7060453865544070642">"Ustawienia klawiatury"</string>
     <string name="phone_language" msgid="1165758957501090679">"Wybierz język"</string>
@@ -1040,7 +1034,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Wprowadzanie tekstu"</string>
     <string name="input_method" msgid="5434026103176856164">"Metoda wprowadzania"</string>
     <string name="current_input_method" msgid="2146807723398303917">"Bieżąca metoda wprowadzania"</string>
-    <string name="input_method_selector" msgid="4311213129681430709">"Selektor metody wprowadzania"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Wybór metody wprowadzania"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatyczny"</string>
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Zawsze pokazuj"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Zawsze ukrywaj"</string>
@@ -1291,42 +1285,35 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Konfiguruj wirtualne sieci prywatne (VPN) i zarządzaj nimi"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nie zmieniono)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nie ustawiono)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Magazyn danych logowania"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Dostęp do poufnych danych"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Zezwalaj aplikacjom na dostęp do bezpiecznych certyfikatów i innych danych logowania"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Zainstaluj z nośnika USB"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Zainstaluj z karty SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Zainstaluj certyfikaty z nośnika USB"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Zainstaluj certyfikaty z karty SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Ustaw hasło"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Ustaw lub zmień hasło magazynu danych logowania"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Wyczyść magazyn"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Wyczyść całą zawartość magazynu danych logowania i zresetuj jego hasło"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Ustaw lub zmień hasło do magazynu danych logowania:"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Wyczyść dane logowania"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Usuń całą zawartość i zresetuj hasło"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Wprowadź hasło"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Wprowadź hasło magazynu danych logowania."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Wprowadź hasło magazynu danych logowania."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Ustaw hasło do magazynu danych logowania. Musi ono mieć co najmniej 8 znaków."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Bieżące hasło:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Nowe hasło:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Potwierdź nowe hasło:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Czy na pewno chcesz usunąć wszystkie dane logowania i zresetować hasło magazynu danych logowania?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Cała zawartość zostanie usunięta, a hasło zostanie zresetowane. Czy na pewno chcesz to zrobić?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Hasła nie są identyczne."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Hasło musi mieć co najmniej 8 znaków."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Wprowadź prawidłowe hasło."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Wprowadź prawidłowe hasło. Pozostała jedna próba wprowadzenia prawidłowego hasła, później zawartość magazynu danych logowania zostanie wyczyszczona."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"Magazyn danych uwierzytelniania został wyczyszczony."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Nieprawidłowe hasło."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Nieprawidłowe hasło. Pozostała jedna próba przed wyczyszczeniem magazynu danych logowania."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Nieprawidłowe hasło. Pozostała liczba prób przed wyczyszczeniem magazynu danych logowania: <xliff:g id="NUMBER">%1$d</xliff:g>."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Wyczyszczono magazyn danych logowania."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Magazyn danych logowania jest włączony."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Sygnał alarmowy"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Skonfiguruj sposób działania w przypadku połączenia alarmowego"</string>
-    <string name="privacy_settings" msgid="9206631214140954954">"Prywatność"</string>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Ustawienia prywatności"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Dane użytkownika"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Ustawienia danych"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Tworzenie i przywracanie kopii zapasowej"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dane osobiste"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Utwórz kopię zapasową moich danych"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Łączenie..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Przejdź do następnego etapu"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"Protokół EAP nie jest obsługiwany"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Połączenia Wi-Fi typu EAP nie można skonfigurować podczas instalacji. Możesz to zrobić po zakończeniu instalacji w sekcji Sieci zwykłe i bezprzewodowe w aplikacji Ustawienia."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Podczas procesu konfiguracji nie można skonfigurować połączenia Wi-Fi zabezpieczonego protokołem EAP. Można to zrobić po zakończeniu tego procesu, wybierając w Ustawieniach opcję "<b>"Sieci zwykłe i bezprzewodowe"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Nawiązanie połączenia może potrwać kilka minut..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Dotknij opcji "<b>"Dalej"</b>", aby kontynuować konfigurację."\n\n"Dotknij opcji "<b>"Wstecz"</b>", aby połączyć się z inną siecią Wi-Fi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Ustawienia synchronizacji"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"W tej chwili występują problemy z synchronizacją. Synchronizacja będzie możliwa wkrótce."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Dodaj konto"</string>
@@ -1400,12 +1385,12 @@
     <string name="settings_backup_summary" msgid="7916877705938054035">"Utwórz kopię zapasową moich ustawień"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Synchronizuj teraz"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Anuluj synchronizację"</string>
-    <string name="sync_one_time_sync" msgid="6766593624598183090">"Dotknij, aby teraz zsynchronizować<xliff:g id="LAST_SYNC_TIME">
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Dotknij, aby zsynchronizować<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalendarz"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontakty"</string>
-    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Google Sync – witamy!"</font>" "\n"Synchronizacja danych w stylu Google zapewniająca dostęp do kontaktów, terminów oraz innych informacji z dowolnego miejsca."</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Google Sync – witamy!"</font>" "\n"Synchronizacja danych zapewniająca dostęp do kontaktów, terminów oraz innych informacji z dowolnego miejsca."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Ustawienia synchronizacji aplikacji"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dane i synchronizacja"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Zmień hasło"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Synchronizacja tego elementu jest obecnie wyłączona. Aby zmienić ustawienie, tymczasowo włącz obsługę danych w tle i automatyczną synchronizację."</string>
     <string name="enter_password" msgid="3268224850821675915">"Wpisz hasło, aby odszyfrować pamięć"</string>
     <string name="try_again" msgid="5904121494468643129">"Spróbuj ponownie"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Usługa jest zajęta. Spróbuj ponownie."</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 999dd7d..a4ce360 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Pedido de emparelhamento de Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pedido de emparelhamento"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Seleccionar emparelhamento com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Mostrar ficheiros recebidos"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Mostrar lista de ficheiros recebidos por Bluetooth"</string>
     <string name="device_picker" msgid="8721012448931226323">"Seleccionador de dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Pedido de emparelhamento de Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Uma aplicação está a pedir autorização para activar o Bluetooth. Pretende fazê-lo?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Selecção da operadora"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Seleccione um operador de rede"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data e hora"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Definir data e hora"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Definir data e hora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Definir data, hora, fuso horário e formatos"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Data e hora automáticas"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utilizar hora fornecida na rede"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Definir A minha localização, desbloqueio do ecrã, bloqueio do cartão SIM, bloqueio do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir O meu local, desbloqueio do ecrã, bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Palavras-passe"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptação do dispositivo"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar dados no dispositivo"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar dados no dispositivo"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necessita de definir um pin ou uma palavra-passe de desbloqueio do dispositivo"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Necessita de definir um pin ou uma palavra-passe de desbloqueio do dispositivo"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"É possível encriptar as suas contas, definições, aplicações transferidas e respectivos dados, multimédia e outros ficheiros. Após encriptar o seu telefone, não é possível desencriptá-lo a não ser que execute uma reposição de dados de fábrica, eliminando todos os dados do telefone."\n\n"A encriptação pode demorar até uma hora. Deve começar com uma bateria carregada e manter o tablet ligado até que a encriptação fique concluída. Se interromper o processo de encriptação, perderá alguns ou todos os seus dados."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"É possível encriptar as suas contas, definições, aplicações transferidas e respectivos dados, multimédia e outros ficheiros. Após encriptar o seu telefone, não é possível desencriptá-lo a não ser que execute uma reposição de dados de fábrica, eliminando todos os dados do telefone."\n\n"A encriptação pode demorar até uma hora. Deve começar com uma bateria carregada e manter o tablet ligado até que a encriptação fique concluída. Se interromper o processo de encriptação, perderá alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar telefone"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmar encriptação"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Encriptar dados do utilizador? Esta operação não é reversível e não poderá ser interrompida sem perda de dados! A encriptação pode demorar até uma hora."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Encriptar dados do utilizador? Esta operação não é reversível e não poderá ser interrompida sem perda de dados! A encriptação pode demorar até uma hora."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encriptação"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Tente novamente dentro de ^1 segundos."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Conf. ecrã de bloqueio"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Configurar ecrã de bloqueio"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Definições de armazenamento"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Desmontar armazenamento USB, ver armazenamento disponível"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Desmontar cartão SD, ver armazenamento disponível"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"O meu número de telefone"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"O meu número de telefone"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MINUTOS"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versão do PRL"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Armazenamento interno"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Armazenamento USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Cartão SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Espaço disponível"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Espaço total"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Disponível"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"A calcular..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Utilização da aplicação"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Utilização multimédia"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplicações"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Multimédia"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desmont. arm. partilhado"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar cartão SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desmontar armaz. USB interno"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do tablet, incluindo:"\n\n<li>"A sua conta Google"</li>\n<li>"Dados e definições do sistema e das aplicações"</li>\n<li>"Aplicações transferidas"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do telefone, incluindo:"\n\n<li>"A sua conta Google"</li>\n<li>"Dados e definições do sistema e das aplicações"</li>\n<li>"Aplicações transferidas"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente, tem sessão iniciada nas seguintes contas:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotografias"</li>\n<li>"Outros dados do utilizador"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Para limpar também músicas, imagens e outros dados do utilizador, é necessário apagar o "<b>"armazenamento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Para limpar também músicas, imagens e outros dados do utilizador, é necessário apagar o "<b>"cartão SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Apagar armazenamento USB"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Configurar e gerir VPNs (Redes Privadas Virtuais)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(não alterado)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(não definido)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Armazenamento de credenciais"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Utilizar credenciais seguras"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Acesso das aplicações a certificados seguros e outras credenciais"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Instalar do armaz. USB"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Instalar a partir do cartão SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Instalar certificados a partir do armazenamento USB"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalar certificados a partir do cartão SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Definir palavra-passe"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Definir ou alterar a palavra-passe do armazenamento de credenciais"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Limpar armazenamento"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Limpar armazenamento de credenciais de todos os conteúdos e repor a respectiva palavra-passe"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Definir ou alterar a palavra-passe do armazenamento de credenciais"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Limpar credenciais"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Remover todo o conteúdo e repor a palavra-passe"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Introduzir palavra-passe"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introduzir a palavra-passe do armazenamento de credenciais."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introduza a palavra-passe do armazenamento de credenciais."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Defina a palavra-passe do armazenamento de credenciais. Tem de ter, pelo menos, 8 caracteres."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Palavra-passe actual:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Nova palavra-passe:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmar nova palavra-passe:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Tem a certeza de que pretende eliminar todas as credenciais e repor a palavra-passe do armazenamento de credenciais?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Todo o conteúdo será removido e a palavra-passe será reposta. Tem a certeza de que pretende continuar?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"As palavras-passe não correspondem."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"A palavra-passe deve ter, pelo menos, 8 caracteres."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Introduza a palavra-passe correcta."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Introduza a palavra-passe correcta. Tem mais uma tentativa para introduzir a palavra-passe correcta antes que o armazenamento de credenciais seja apagado."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"O armazenamento de credenciais foi apagado."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Palavra-passe incorrecta."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Palavra-passe incorrecta. Tem mais uma tentativa antes de o armazenamento de credenciais ser apagado."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Palavra-passe incorrecta. Tem mais <xliff:g id="NUMBER">%1$d</xliff:g> tentativas antes de o armazenamento de credenciais ser apagado."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Armaz. credenciais apagado."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais está activado."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir o comportamento quando é efectuada uma chamada de emergência"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"A ligar..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Continue para o passo seguinte"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP não suportado"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Não é possível configurar uma ligação EAP Wi-Fi durante a configuração. Depois de configurar, poderá fazê-lo nas Definições, em Redes &amp; sem fios."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Não é possível configurar uma ligação Wi-Fi tipo EAP durante a configuração. Após a configuração, é possível fazê-lo em Definições, em "<b>"Redes sem fios"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"A ligação pode demorar alguns minutos..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Toque em "<b>"Seguinte"</b>" para continuar a configuração."\n\n"Toque em "<b>"Anterior"</b>" para ligar a uma rede Wi-Fi diferente."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Definições de sincronização"</string>
     <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"A sincronização está actualmente com problemas e será retomada em breve."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Adicionar conta"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"A sincronização deste item está actualmente desactivada. Para alterar as suas preferências, active temporariamente os dados em segundo plano e a sincronização automática."</string>
     <string name="enter_password" msgid="3268224850821675915">"Introduzir palavra-passe para desencriptar armazenamento"</string>
     <string name="try_again" msgid="5904121494468643129">"Lamentamos, tente novamente"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Serviço ocupado, tente novamente"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d3a8076..c31be36 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitação de pareamento Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitação de pareamento"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Selecione para parear <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Exibir arquivos recebidos"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Exibir a lista de arquivos recebidos via Bluetooth"</string>
     <string name="device_picker" msgid="8721012448931226323">"Selecionador de dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitação de permissão para Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Um aplicativo está solicitando permissão para ativar o Bluetooth. Deseja fazer isso?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Seleção de operador"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Selecione um operador de rede"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data e hora"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Definir data e hora"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Configurar data e hora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Definir data, hora, fuso horário e formatos"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Data e hora automáticas"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Usar horário fornecido pela rede"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Senhas"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptografia do aparelho"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Criptografar dados no aparelho"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Criptografar dados no aparelho"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Exige que você configure um pin ou uma senha para desbloquear o aparelho"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Exige que você configure um pin ou uma senha para desbloquear o aparelho"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Criptografado"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Você pode criptografar suas contas, configurações e os aplicativos transferidos com seus respectivos dados, mídia e outros arquivos. Depois de criptografar seu telefone, você não poderá desfazer a criptografia a não ser redefinindo a configuração original dos dados, apagando todos os dados em seu telefone."\n\n"A criptografia leva até uma hora. Você deve iniciar com uma bateria carregada e manter seu telefone conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, você perderá alguns ou todos os seus dados."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Você pode criptografar suas contas, configurações e os aplicativos transferidos com seus respectivos dados, mídia e outros arquivos. Depois de criptografar seu telefone, você não poderá desfazer a criptografia a não ser redefinindo a configuração original dos dados, apagando todos os dados em seu telefone."\n\n"A criptografia leva até uma hora. Você deve iniciar com uma bateria carregada e manter seu telefone conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, você perderá alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Criptografar tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Criptografar telefone"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmar criptografia"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Criptografar dados do usuário? Essa operação não é reversível nem pode ser interrompida sem perda de dados! A criptografia pode levar até uma hora."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Criptografar dados do usuário? Essa operação não é reversível nem pode ser interrompida sem perda de dados! A criptografia pode levar até uma hora."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Criptografando"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Tente novamente em ^1 segundos."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Config. tela de bloqueio"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Config. tela de bloqueio"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Configurações de armazenamento"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Desconectar armazenamento USB, ver armazenamento disponível"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Desmontar o cartão SD, visualizar armazenamento disponível"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Meu número de telefone"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Meu número de telefone"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versão PRL"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Armazenamento interno"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Armaz. USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Cartão SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Espaço disponível"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Espaço total"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Disponível"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Uso do aplicativo"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Uso da mídia"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplicativos"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Mídia"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desconectar armaz. comp."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar cartão SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desconectar armaz. USB interno"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Esta ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:"\n\n<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados de aplicativos e sistema "</li>\n<li>"Aplicativos que você fez download"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Esta ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu telefone, incluindo:"\n\n<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados de aplicativos e sistema "</li>\n<li>"Aplicativos que você fez download"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Para também limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n" "\n"Para também apagar músicas, fotos e outros dados de usuário, o "<b>"cartão SD "</b>"precisa ser apagado."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Apagar armazenamento USB"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Configurar e gerenciar VPNs (Redes privadas virtuais)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(não alterado)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(não definido)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Armazenamento de credenciais"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Usar credenciais seguras"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Permitir que os aplicativos acessem credenciais e certificados seguros"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Instalar do armazenamento USB"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Instalar do cartão SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Instalar certificados do armazenamento USB"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalar certificados do cartão SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Definir senha"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Definir ou alterar a senha do armazenamento de credenciais"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Limpar armazenamento"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Remover todo o conteúdo do armazenamento de credenciais e redefinir a senha"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Configurar ou alterar a senha para o armazenamento de credencial"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Limpar credenciais"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Remover todos os conteúdos e redefinir a senha"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Inserir senha"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Insira a senha do armazenamento de credenciais."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Digite a senha para o armazenamento de credencial."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Configure a senha para o armazenamento de credencial. Ela deve ter no mínimo 8 caracteres."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Senha atual:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Nova senha:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmar nova senha:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Tem certeza de que deseja excluir todas as credenciais e redefinir a senha do armazenamento de credenciais?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Todos os conteúdos serão removidos e a senha será redefinida. Tem certeza de que deseja fazer isso?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"As senhas não correspondem."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"A senha deve ter no mínimo 8 caracteres."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Insira a senha correta."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Insira a senha correta. Você tem mais uma tentativa para inserir a senha correta antes que o armazenamento de credenciais seja apagado."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"O armazenamento de credenciais foi apagado."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Senha incorreta."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Senha incorreta. Você tem uma ou mais chances antes do armazenamento de credencial ser apagado."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Senha incorreta. Você tem mais <xliff:g id="NUMBER">%1$d</xliff:g> chances antes do armazenamento de credencial ser apagado."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"O armazenamento de credenciais foi apagado."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais foi ativado."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir comportamento durante uma chamada de emergência"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Conectando..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Prosseguir para próxima etapa"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP não é suportado"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Não é possível configurar uma conexão Wi-Fi EAP durante a configuração. É possível fazer isso em seguida, na opção Configurações, em Sem fio &amp; Redes."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Não é possível configurar uma conexão Wi-Fi EAP durante a instalação. Após a instalação, você pode fazer isso em Configurações, "<b>"Redes e Redes sem fio"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"A conexão pode demorar alguns minutos..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Toque em "<b>"Próximo"</b>" para continuar a configuração."\n\n"Toque em "<b>"Voltar"</b>" para conectar-se a outra rede Wi-Fi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Configurações de sincronização"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"A sincronização está enfrentando problemas no momento. Ela retornará em breve."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Adicionar conta"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"A sincronização para o item está desativada no momento. Para alterar a sua preferência, ative os dados de segundo plano e a sincronização automática temporariamente."</string>
     <string name="enter_password" msgid="3268224850821675915">"Digite uma senha para criptografar o armazenamento"</string>
     <string name="try_again" msgid="5904121494468643129">"Tente novamente"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Serviço ocupado, tente novamente"</string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index b430dbe..4abf2ab 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -310,6 +310,10 @@
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
+    <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
     <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
@@ -324,6 +328,14 @@
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
+    <skip />
     <!-- outdated translation 3973555216065628262 -->     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Segirezza da la debloccaziun dal visur"</string>
     <!-- outdated translation 1129684221223017902 -->     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Endrizzar la bloccaziun dal visur"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Midar la bloccaziun dal visur"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 4e9720b..0f0bcf7 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitare de împerechere prin Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitare de împerechere"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Selectaţi împerecherea cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Afişaţi fişierele primite"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Afişaţi fişierele primite prin Bluetooth"</string>
     <string name="device_picker" msgid="8721012448931226323">"Selector de dispozitive Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitare de permisiune Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"O aplicaţie solicită permisiunea de a activa Bluetooth. Acordaţi permisiunea?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Selectarea operatorului"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Selectaţi un operator de reţea"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data şi ora"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Setaţi data şi ora"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Setaţi data şi ora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Setaţi data, ora, fusul orar şi formatele."</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Dată şi oră automate"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utilizaţi ora furnizată de reţea"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Setaţi Locaţia mea, deblocarea ecranului, blocarea cardului SIM, blocarea stocării acreditărilor"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setaţi Locaţia mea, deblocarea ecranului, blocarea stocării acreditărilor"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Parole"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptarea dispozitivului"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Criptaţi datele de pe dispozitiv"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Criptaţi datele de pe dispozitiv"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necesită setarea unui cod PIN sau a unei parole de deblocare a dispozitivului"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Necesită setarea unui cod PIN sau a unei parole de deblocare a dispozitivului"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Criptat"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea telefonului, nu îl puteţi decripta decât prin resetarea la configuraţia din fabrică, ceea ce va şterge toate datele de pe acesta."\n\n"Criptarea poate dura până la o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi telefonul conectat până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea telefonului, nu îl puteţi decripta decât prin resetarea la configuraţia din fabrică, ceea ce va şterge toate datele de pe acesta."\n\n"Criptarea poate dura până la o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi telefonul conectat până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Criptaţi tableta"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Criptaţi telefonul"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmaţi criptarea"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Criptaţi datele utilizatorului? Această operaţie nu este reversibilă şi nu poate fi întreruptă fără pierderea unor date! Criptarea poate dura până la o oră."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Criptaţi datele utilizatorului? Această operaţie nu este reversibilă şi nu poate fi întreruptă fără pierderea unor date! Criptarea poate dura până la o oră."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Criptare"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Încercaţi din nou peste ^1 (de) secunde."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Config. bloc. ecran."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Config. bloc. ecran."</string>
@@ -471,7 +466,7 @@
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Introduceţi codul PIN de la punctul de acces"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Configurare WPS"</string>
     <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Introduceţi codul PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> la punctul de acces"</string>
-    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS este în desfăşurare, iar până la finalizare poate trece un minut"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS este în desfăşurare, iar până la finalizare pot trece zeci de secunde"</string>
     <string name="wifi_wps_failed" msgid="2277409652621482331">"Eşuare la pornirea WPS, încercaţi din nou"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID reţea"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Securitatea"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Setări de stocare"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Demontaţi stocarea USB, afişaţi stocarea disponibilă"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Demontaţi cardul SD, afişaţi spaţiul de stocare disponibil"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Numărul meu de telefon"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Numărul meu de telefon"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versiune PRL"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Stocare internă"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Stocare USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Card SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Spaţiu disponibil"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Spaţiu total"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Disponibil"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Se calculează..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Utilizare aplicaţii"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Utilizare media"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplicaţii"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Demontaţi stoc. distrib."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Demontaţi cardul SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Demontaţi stocarea USB internă"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Această acţiune va şterge toate datele din "<b>"stocarea internă"</b>" a tabletei, inclusiv:"\n\n<li>"Contul dvs. Google"</li>\n<li>"datele şi setările sistemului şi ale aplicaţiilor"</li>\n<li>"aplicaţiile descărcate"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Această acţiune va şterge toate datele din "<b>"stocarea internă"</b>" a telefonului, inclusiv:"\n\n<li>"Contul dvs. Google"</li>\n<li>"datele şi setările sistemului şi ale aplicaţiilor"</li>\n<li>"aplicaţiile descărcate"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"În prezent sunteţi conectat(ă) la următoarele conturi:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzică"</li>\n<li>"Fotografii"</li>\n<li>"Alte date ale utilizatorului"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"De asemenea, pentru a şterge muzică, imagini şi alte date ale utilizatorului, "<b>"stocarea USB"</b>" trebuie să fie ştearsă."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"De asemenea, pentru a şterge muzică, imagini şi alte date ale utilizatorului, "<b>"cardul SD"</b>" trebuie să fie şters."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Ştergeţi stocarea USB"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Configuraţi şi gestionaţi reţele private virtuale (VPN)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nemodificat)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nesetat)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Stocarea acreditărilor"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Utilizaţi acreditări securizate"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Permiteţi aplicaţiilor să acceseze certificate securizate şi alte acreditări"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Instalaţi de pe stocarea USB"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Instalaţi de pe cardul SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Instalaţi certificate de pe stocarea USB"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalaţi certificate de pe cardul SIM"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Setaţi parola"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Setaţi sau modificaţi parola pentru stocarea acreditărilor"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Ştergeţi datele stocate"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Eliminaţi stocarea acreditărilor pentru întregul conţinut şi resetaţi parola"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Setaţi sau schimbaţi parola pentru stocarea acreditărilor"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Ştergeţi acreditările"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Eliminaţi întregul conţinut şi resetaţi parola"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Introduceţi parola"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introduceţi parola pentru stocarea acreditărilor."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introduceţi parola pentru stocarea acreditărilor."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Setaţi parola pentru stocarea acreditărilor. Parola trebuie să aibă cel puţin 8 caractere."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Parola actuală:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Parola nouă:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmaţi noua parolă:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Sigur doriţi să ştergeţi toate acreditările şi să resetaţi parola pentru stocarea acestora?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Întregul conţinut va fi eliminat, iar parola va fi resetată. Sigur doriţi acest lucru?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Parolele nu corespund."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Parola trebuie să conţină minimum 8 caractere."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Introduceţi parola corectă."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Introduceţi parola corectă. Mai aveţi la dispoziţie o încercare pentru a introduce parola corectă înainte ca stocarea acreditărilor să fie ştearsă."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"Stocarea acreditărilor este ştearsă."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Parolă incorectă."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Parolă incorectă. Mai aveţi dreptul la o singură încercare înainte ca stocarea acreditărilor să fie ştearsă."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Parolă incorectă. Mai aveţi dreptul la <xliff:g id="NUMBER">%1$d</xliff:g> încercări înainte ca stocarea acreditărilor să fie ştearsă."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Stoc. acredit. este ştearsă."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Stocarea acreditărilor este activată."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton de urgenţă"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Setaţi comportamentul la efectuarea unui apel de urgenţă"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Se conectează..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Treceţi la următorul pas"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP nu este acceptat"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Nu puteţi configura o conexiune EAP Wi-Fi în expertul de configurare. După încheierea configurării, puteţi face acest lucru în Setări, la Wireless şi reţele."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Nu puteţi configura o conexiune Wi-Fi EAP în timpul instalării. După instalare, puteţi face acest lucru în Setări, sub "<b>"Wireless şi reţele"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Conectarea poate dura câteva minute..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Atingeţi "<b>"Înainte"</b>" pentru a continua configurarea."\n\n"Atingeţi "<b>"Înapoi"</b>" pentru a vă conecta la o altă reţea Wi-Fi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Setări de sincronizare"</string>
     <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Sincronizarea se confruntă în prezent cu probleme. Aceasta va fi funcţională în curând."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Adăugaţi un cont"</string>
@@ -1405,7 +1390,7 @@
     <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Calendar"</string>
     <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Agendă"</string>
-    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Bun venit la sincronizarea Google!"</font>" "\n"O abordare Google asupra sincronizării datelor, care permite accesul la persoanele de contact, întâlniri şi multe alte informaţii, oriunde v-aţi afla."</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Bun venit la Sincronizarea Google!"</font>" "\n"O abordare Google asupra sincronizării datelor, care permite accesul la persoanele de contact, întâlniri şi multe alte informaţii, oriunde v-aţi afla."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Setări privind sincronizarea aplicaţiei"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Datele şi sincronizarea"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Schimbaţi parola"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"În prezent, sincronizarea pentru acest element este dezactivată. Pentru a schimba preferinţa, activaţi temporar datele de fundal şi sincronizarea automată."</string>
     <string name="enter_password" msgid="3268224850821675915">"Introduceţi parola de decriptare a stocării"</string>
     <string name="try_again" msgid="5904121494468643129">"Ne pare rău, încercaţi din nou"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Serviciul este ocupat, încercaţi din nou"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b6c7e36..89739e1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -27,7 +27,7 @@
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Получить список PDP"</string>
     <string name="radioInfo_service_in" msgid="1915416319177520020">"В зоне обслуживания"</string>
     <string name="radioInfo_service_out" msgid="5238736759641916278">"Вне зоны обслуживания"</string>
-    <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Только экстренный вызов"</string>
+    <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Только экстренные вызовы"</string>
     <string name="radioInfo_service_off" msgid="1434084741785525415">"Радио отключено"</string>
     <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Роуминг"</string>
     <string name="radioInfo_roaming_not" msgid="2851853244069662307">"Роуминг отключен"</string>
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Запрос сопряжения Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Запрос на сопряжение"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Выберите для сопряжения с <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Показать полученные файлы"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Показать список файлов, полученных через Bluetooth"</string>
     <string name="device_picker" msgid="8721012448931226323">"Выбор устройства Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запрос разрешения на включение Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Приложение на вашем планшетном ПК запрашивает разрешение на включение Bluetooth. Разрешить?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Выбор оператора"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Выберите оператора связи"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Дата и время"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Установите дату и время"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Установить дату и время"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Установка даты, времени, часового пояса и форматов"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Автонастройка даты и времени"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Использовать время сети"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифрование устройства"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Зашифровать данные на устройстве"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Зашифровать данные на устройстве"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Требуется установить PIN-код или пароль для разблокировки устройства"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Требуется установить PIN-код или пароль для разблокировки устройства"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Зашифровано"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Вы можете зашифровать свои аккаунты, настройки, загруженные приложения и их данные, мультимедийные и другие файлы. После того как ваш телефон будет зашифрован, вы сможете расшифровать его, только выполнив сброс настроек, что приведет к удалению всех данных на вашем телефоне."\n\n"Процесс шифрования занимает около часа. Перед началом шифрования убедитесь, что батарея заряжена полностью, и не выключайте телефон до завершения шифрования. Если этот процесс будет прерван, вы можете потерять все свои данные или их часть."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Вы можете зашифровать свои аккаунты, настройки, загруженные приложения и их данные, мультимедийные и другие файлы. После того как ваш телефон будет зашифрован, вы сможете расшифровать его, только выполнив сброс настроек, что приведет к удалению всех данных на вашем телефоне."\n\n"Процесс шифрования занимает около часа. Перед началом шифрования убедитесь, что батарея заряжена полностью, и не выключайте телефон до завершения шифрования. Если этот процесс будет прерван, вы можете потерять все свои данные или их часть."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Зашифровать планшет"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Зашифровать телефон"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Подтвердить шифрование"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Зашифровать данные пользователя? Эту операцию нельзя отменить. Ее также нельзя прерывать, поскольку это может привести к потере данных! Шифрование может занять около часа."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Зашифровать данные пользователя? Эту операцию нельзя отменить. Ее также нельзя прерывать, поскольку это может привести к потере данных! Шифрование может занять около часа."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифрование"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Повторите попытку через ^1 с."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Настройка блокировки экрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Настройка блокировки экрана"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Настройки хранилища"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Отключить USB-накопитель, просмотреть доступные накопители"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Отключение SD-карты, сведения о доступной памяти"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Мой номер телефона"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Мой номер телефона"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Версия PRL"</string>
@@ -663,15 +658,15 @@
     <string name="internal_memory" msgid="9129595691484260784">"Внутренний накопитель"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-накопитель"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-карта"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Свободное место"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Всего места"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Доступно"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Всего"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Выполняется расчет..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Объем ваших приложений"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Объем ваших данных"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Приложения"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Мультимедиа"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Безопасное извлечение"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Извлечь SD-карту"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Отключить внутр. USB-накопитель"</string>
-    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Отключить SD-карту для безопасного извлечения"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Отключение SD-карты для ее безопасного извлечения из устройства"</string>
     <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Вставить USB-накопитель для подключения"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Вставьте SD-карту для подключения"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Подключить USB-накопитель"</string>
@@ -680,8 +675,8 @@
     <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Подключить SD-карту"</string>
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Очистить USB-накопитель"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Очистить SD-карту"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Удаляет с USB-накопителя музыку, фотографии и все другие данные."</string>
-    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Удаляет все данные с SD-карты, например музыку и фотографии"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Удаление с внутреннего USB-накопителя телефона всех данных, включая музыку и фотографии."</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Удаление с SD-карты всех данных, включая музыку и фотографии"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Недоступно"</string>
     <string name="read_only" msgid="6702420168629076340">" (только для чтения)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Отключить USB-накопитель"</string>
@@ -732,19 +727,18 @@
     <string name="menu_restore" msgid="8260067415075573273">"Восстановить настройки по умолчанию"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Восстановление настроек APN по умолчанию завершено"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Сброс настроек"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Удаляет все данные из памяти планшетного ПК"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Удаляет все данные из памяти телефона"</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Возврат к заводским настройкам и удаление всех данных из памяти планшетного ПК"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Возврат к заводским настройкам и удаление всех данных из памяти телефона"</string>
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Это приведет к удалению всех данных с "<b>"внутреннего накопителя"</b>" планшета, среди которых: "\n\n<li>"Ваш аккаунт Google;"</li>\n<li>"Настройки/данные системы и приложений;"</li>\n<li>"Загруженные приложения."</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Это приведет к удалению всех данных с "<b>"внутреннего накопителя"</b>", среди которых:"\n\n<li>"Ваш аккаунт Google;"</li>\n<li>"Настройки/данные системы и приложений;"</li>\n<li>"Загруженные приложения."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"В настоящее время вы выполнили вход в следующие аккаунты:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музыка"</li>\n<li>"Фото"</li>\n<li>"Другие данные"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Чтобы удалить музыку, изображения и другие пользовательские данные, необходимо удалить всю информацию с "<b>"USB-накопителя"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Чтобы удалить музыку, фотографии и другие данные пользователя, необходимо очистить "<b>"SD-карту"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Очистить USB-накопитель"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Очистить SD-карту"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Удалить с USB-накопителя музыку, фотографии и все другие данные."</string>
-    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Удаляет с SD-карты музыку, фотографии и все другие данные."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Удаление с SD-карты всех данных, включая музыку и фотографии"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Сбросить планшетный ПК"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Сбросить настройки телефона"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Стереть всю личную информацию и загруженные приложения? Это действие нельзя отменить!"</string>
@@ -756,7 +750,7 @@
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Очистить USB-накопитель"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Очистить SD-карту"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Уничтожает все данные на USB-накопителе"</string>
-    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Удаляет все данные с карты SD"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Удаление всех данных с SD-карты"</string>
     <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Это приведет к очистке USB-накопителя. Вы потеряете "<b>"все"</b>" хранящиеся на нем данные!"</string>
     <string name="media_format_desc" product="default" msgid="1598627584181935513">"Это приведет к очистке SD-карты. Вы потеряете "<b>"все"</b>" данные на карте!"</string>
     <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Очистить USB-накопитель"</string>
@@ -965,7 +959,7 @@
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Использование памяти"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Проверьте, сколько места в памяти устройства занимают различные приложения"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Работающие приложения"</string>
-    <string name="runningservices_settings_summary" msgid="854608995821032748">"Просмотр и управление работающими программами"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Просмотр и управление работающими приложениями"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Перезапуск"</string>
     <string name="cached" msgid="1059590879740175019">"Кэшированный фоновый процесс"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Ничего не запущено."</string>
@@ -1291,50 +1285,43 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Настройка и управление виртуальными частными сетями (VPN)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(не изменялось)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(не настроено)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Хранилище регистрационных данных"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Доступ к хранилищу"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Разрешить приложениям использовать хранилище сертификатов и рег. данных"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Установка с USB-накопителя"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Установка с SD-карты"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Устанавливать сертификаты с USB-накопителя"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Установить сертификаты с SD-карты"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Установить пароль"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Установить или изменить пароль для доступа в хранилище регистрационных данных"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Очистить хранилище."</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Очистить все регистрационные данные в хранилище и сбросить пароль"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Установить или изменить пароль для хранилища регистрационных данных"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Очистить регистрационные данные"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Удалить все содержание и сбросить пароль"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Ввод пароля"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Введите пароль для доступа в хранилище регистрационных данных."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Введите пароль для хранилища регистрационных данных."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Установите пароль для хранилища регистрационных данных. Он должен иметь не менее 8 знаков."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Текущий пароль:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Новый пароль:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Подтвердите новый пароль:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Вы действительно хотите удалить все регистрационные данные и сбросить пароль для доступа в хранилище регистрационных данных?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Все содержание будет удалено, а пароль изменен. Продолжить?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Пароли не совпадают."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"В пароле должно быть не менее 8 символов."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Введите правильный пароль."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Введите правильный пароль. У вас осталась 1 попытка. После этого хранилище регистрационных данных будет очищено."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"Хранилище регистрационных данных очищено."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Неправильный пароль."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Неверный пароль. У вас осталась одна попытка, после которой хранилище регистрационных данных будет очищено."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Неверный пароль. Осталось несколько попыток (<xliff:g id="NUMBER">%1$d</xliff:g>). Затем хранилище регистрационных данных будет очищено."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Хранилище регистрационных данных очищено."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Хранилище регистрационных данных включено."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тональный сигнал экстренного вызова"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Настроить режим работы при экстренном вызове"</string>
-    <string name="privacy_settings" msgid="9206631214140954954">"Конфиденциальность"</string>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Настройки конфиденциальности"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Восстановление и сброс"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Восстановление данных и настроек"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Резервное копирование и восстановление"</string>
-    <string name="personal_data_section_title" msgid="7815209034443782061">"Личные данные"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Возврат к заводским настройкам"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Резервное копирование данных"</string>
-    <string name="backup_data_summary" msgid="6515285107793232815">"Резервное копирование данных приложений, паролей Wi-Fi и других настроек в Google"</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Сохранять резервные копии данных приложений, паролей точек доступа Wi-Fi и настроек на серверах Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Сохранить данные аккаунта"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Не найдены аккаунты с резервными копиями данных"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Автовосстановление"</string>
-    <string name="auto_restore_summary" msgid="83177150536734378">"При переустановке приложения восстановить резервные копии настроек и других данных"</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"При переустановке приложений автоматически восстанавливать данные и настройки из резервных копий"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Резервное копирование"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Вы уверены, что хотите прекратить создавать резервные копии паролей Wi-Fi, закладок, настроек и данных приложений и удалить все копии с серверов Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Настройки администрирования устройства"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Подключение..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Перейти к следующему шагу"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP не поддерживается"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Wi-Fi подключение по методу EAP не может быть сконфигурировано при настройке. После завершения настройки это можно будет сделать в разделе \"Настройки\" в группе \"Беспроводные сети\"."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939"><b>"Нельзя настроить подключение EAP Wi-Fi во время установки. После установки вы можете сделать это в меню \"Настройки\" &gt; \"Беспроводные сети\"."</b></string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Соединение может занять несколько минут..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Нажмите "<b>"Далее"</b>" для продолжения установки."\n\n"Нажмите "<b>"Назад"</b>" для подключения к другой сети Wi-Fi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Настройки синхронизации"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Проблемы с синхронизацией. Скоро все снова будет работать."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Добавить аккаунт"</string>
@@ -1405,9 +1390,9 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Календарь"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Контакты"</string>
-    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Добро пожаловать в Google Sync!"</font>" "\n"Технология Google для синхронизации данных, позволяющая получать данные о контактах, встречах и многом другом, где бы вы ни были."</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Добро пожаловать в Google Sync!"</font>" "\n"Технология Google синхронизации данных позволяет получать данные о контактах, встречах и многом другом с любого устройства."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Настройки синхронизации приложения"</string>
-    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Данные и синхронизация"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Cинхронизация данных"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Изменить пароль"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"Настройки аккаунта"</string>
     <string name="remove_account_label" msgid="5921986026504804119">"Удалить аккаунт"</string>
@@ -1416,14 +1401,13 @@
     <string name="really_remove_account_title" msgid="6574643117748564960">"Удалить аккаунт"</string>
     <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Вы действительно хотите удалить этот аккаунт? Это приведет к потере всех связанных с ним сообщений, контактов и других данных в планшетном ПК. "\n"Продолжить?"</string>
     <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Вы действительно хотите удалить этот аккаунт? Это приведет к потере всех связанных с ним сообщений, контактов и других данных, имеющихся в телефоне."\n"Продолжить?"</string>
-    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Этот аккаунт используется некоторыми приложениями. Чтобы удалить его, нужно восстановить настройки по умолчанию (при этом все личные данные будут потеряны). Для этого откройте \"Настройки\" в разделе \"Конфиденциальность\"."</string>
-    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Этот аккаунт используется некоторыми приложениями. Чтобы удалить его, нужно восстановить настройки по умолчанию (при этом все личные данные будут потеряны). Для этого откройте \"Настройки\" в разделе \"Конфиденциальность\"."</string>
-    <string name="provider_label" msgid="7724593781904508866">"Подписки Push"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Данный аккаунт используется некоторыми приложениями. Чтобы удалить его, перейдите в меню \"Настройки\", выберите пункт \"Восстановление и сброс\" и нажмите \"Сброс настроек\". Обратите внимание: при этом все ваши личные данные будут также удалены с устройства."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Данный аккаунт используется некоторыми приложениями. Чтобы удалить его, перейдите в меню \"Настройки\", выберите пункт \"Восстановление и сброс\" и нажмите \"Сброс настроек\". Обратите внимание: при этом все ваши личные данные будут также удалены с устройства."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Подписки на рассылки оператора"</string>
     <string name="sync_item_title" msgid="1931551540462877488">"Синхронизировать <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Не удается синхронизировать вручную"</string>
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Синхронизация для этого элемента отключена. Чтобы изменить настройку, временно разрешите использование фонового режима передачи данных и автоматическую синхронизацию."</string>
     <string name="enter_password" msgid="3268224850821675915">"Чтобы расшифровать данные хранилища, введите пароль."</string>
     <string name="try_again" msgid="5904121494468643129">"Повторите попытку"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Служба занята, повторите попытку"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 7357ef1..1567c74 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Žiadosť o párovanie zariadenia Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Žiadosť na párovanie"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Povoliť párovanie so zariadením<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Zobraziť prijaté súbory"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Zobraz. zoznam súborov prijatých pomocou Bluetooth"</string>
     <string name="device_picker" msgid="8721012448931226323">"Výber zariadenia Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Žiadosť o povolenie zariadenia Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Aplikácia vyžaduje povolenie na zapnutie pripojenia Bluetooth. Chcete udeliť toto povolenie?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Výber operátora"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Vybrať sieťového operátora"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Dátum a čas"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Nastaviť dátum a čas"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Nastaviť dátum a čas"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Umožňuje nastaviť dátum, čas, časové pásmo a formát"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Automatický dátum a čas"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Použiť čas zo siete"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Moja poloha, odomknutie obrazovky, zámok SIM, zámok ukladacieho priestoru poverení"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavenie funkcie Moje poloha, odomknutie obrazovky a zamknutie ukladacieho priestoru poverení"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Heslá"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrovanie zariadenia"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifrovať údaje v zariadení"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifrovať údaje v zariadení"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Vyžaduje nastavenie kódu PIN na odomknutie zariadenia alebo hesla"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Vyžaduje nastavenie kódu PIN na odomknutie zariadenia alebo hesla"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrované"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Svoje účty, nastavenia, prevzaté aplikácie a ich údaje môžete šifrovať. Po zašifrovaní tabletu budete môcť toto šifrovanie zrušiť iba obnovením továrenských nastavení, čím sa všetky údaje v tablete vymažú."\n\n"Šifrovanie môže trvať až hodinu. V tablete musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, prídete o niektoré alebo dokonca o všetky údaje."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Svoje účty, nastavenia, prevzaté aplikácie a ich údaje môžete šifrovať. Po zašifrovaní tabletu budete môcť toto šifrovanie zrušiť iba obnovením továrenských nastavení, čím sa všetky údaje v tablete vymažú."\n\n"Šifrovanie môže trvať až hodinu. V tablete musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, prídete o niektoré alebo dokonca o všetky údaje."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrovať tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrovať telefón"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Potvrdiť šifrovanie"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Šifrovať používateľské údaje? Táto operácia sa nedá vrátiť späť a nesmie byť prerušená, inak dôjde ku strate údajov. Šifrovanie môže trvať až hodinu."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Šifrovať používateľské údaje? Táto operácia sa nedá vrátiť späť a nesmie byť prerušená, inak dôjde ku strate údajov. Šifrovanie môže trvať až hodinu."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifrovanie"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Počet sekúnd zostávajúcich do ďalšieho pokusu: ^1."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Konf. uzamknutia obr."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Konf. uzamknutia obr."</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Nastavenia ukladacieho priestoru"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Odpojiť ukladací priestor USB a zobraziť dostupný ukladací priestor"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Umožňuje odpojiť kartu SD a zobraziť dostupný ukladací priestor"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Moje telefónne číslo"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Moje telefónne číslo"</string>
     <string name="status_min_number" msgid="3519504522179420597">"Min."</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Verzia PRL"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Interný ukl. priestor"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Ukladací priestor USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Karta SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Pamäť k dispozícii"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Celková pamäť"</string>
+    <string name="memory_available" msgid="5052397223077021181">"K dispozícii"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Celkom"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Prebieha výpočet..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Použitie aplikácií"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Použitie médií"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplikácie"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Médiá"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odpojte zdieľaný ukl. priestor"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Odpojiť kartu SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Odp. interný ukl. priestor USB"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Táto operácia vymaže všetky údaje v "<b>"internom ukladacom priestore"</b>" tabletu vrátane:"\n\n<li>"účtu Google,"</li>\n<li>"údajov a nastavení systému a aplikácií,"</li>\n<li>"prevzatých aplikácií."</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Táto operácia vymaže všetky údaje v "<b>"internom ukladacom priestore"</b>" telefónu vrátane:"\n\n<li>"účtu Google,"</li>\n<li>"údajov a nastavení systému a aplikácií,"</li>\n<li>"prevzatých aplikácií."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálne ste prihlásení do nasledujúcich účtov:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Hudba"</li>\n<li>"Fotografie"</li>\n<li>"Iné používateľské údaje"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Ak chcete vymazať aj hudbu, obrázky a ďalšie používateľské údaje, musíte vymazať "<b>"ukladací priestor USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Ak chcete vymazať aj hudbu, obrázky a ďalšie používateľské údaje, musíte vymazať "<b>"kartu SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Vymazať ukladací priestor USB"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Nastaviť a spravovať siete VPN"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nezmenené)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nie je nastavené)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Ukladací priestor poverení"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Použiť zabezpečené poverenia"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Povoliť aplikáciám prístup k zabezpečeným certifikátom a ďalším povereniam"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Inšt. z ukl. priest. USB"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Inštalácia z karty SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Inštalovať certifikáty z ukladacieho priestoru USB"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Inštalovať certifikáty z karty SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Nastaviť heslo"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Nastavenie alebo zmena hesla ukladacieho priestoru poverení"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Vymazať ukladací priestor"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Vymazať celý obsah ukladacieho priestoru poverení a obnoviť heslo"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Nastaviť alebo zmeniť heslo pre ukladací priestor poverení."</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Vymazať poverenia"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Odstrániť všetok obsah a obnoviť heslo"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Zadajte heslo"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Zadajte heslo ukladacieho priestoru poverení."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Zadajte heslo pre ukladací priestor poverení."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Nastaviť heslo pre ukladací priestor poverení (najmenej 8 znakov)."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuálne heslo:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Nové heslo:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Potvrďte nové heslo:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Naozaj chcete odstrániť všetky poverenia a obnoviť heslo do ukladacieho priestoru poverení?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Všetok obsah bude odstránený a heslo bude obnovené. Naozaj chcete pokračovať?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Heslá sa nezhodujú."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Heslo musí mať aspoň 8 znakov."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Zadajte správne heslo."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Zadajte správne heslo. Na zadanie správneho hesla máte ešte jeden pokus, potom bude ukladací priestor poverení vymazaný."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"Ukladací priestor poverení je vymazané."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Nesprávne heslo."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Nesprávne heslo. Do vymazania ukladacieho priestoru poverení vám zostáva jeden pokus."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Nesprávne heslo. Počet zostávajúcich pokusov do vymazania ukladacieho priestoru poverení: <xliff:g id="NUMBER">%1$d</xliff:g>."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Ukl. priestor pover. je vymaz."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Ukladací priestor poverení je aktivovaný."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tiesňové vyzváňanie"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastaviť správanie pri tiesňovom volaní"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Prebieha pripájanie..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Pokračovať na ďalší krok"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"Zabezpečenie EAP nie je podporované"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Počas inštalácie nie je možné konfigurovať pripojenie k sieti Wi-Fi cez protokol EAP. Po inštalácii to môžete vykonať v Nastaveniach v časti Bezdrôtové pripojenie a siete."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Pripojenie Wi-Fi so zabezpečením EAP nemôžete nakonfigurovať počas nastavovania. Môžete to urobiť neskôr v Nastaveniach v časti "<b>"Bezdrôtové pripojenie a siete"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Pripájanie môže trvať niekoľko minút..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Ak chcete pokračovať v nastavovaní, dotknite sa možnosti "<b>"Ďalej"</b>"."\n\n"Ak sa chcete pripojiť k inej sieti Wi-Fi, dotknite sa možnosti "<b>"Späť"</b>"."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Nastavenia synchronizácie"</string>
     <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Vyskytli sa problémy so synchronizáciou. Služba bude čoskoro obnovená."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Pridať účet"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Synchronizácia tejto položky je momentálne zakázaná. Ak chcete predvoľbu zmeniť, dočasne zapnite prenos údajov na pozadí a automatickú synchronizáciu."</string>
     <string name="enter_password" msgid="3268224850821675915">"Ak chcete dešifrovať ukladací priestor, zadajte heslo"</string>
     <string name="try_again" msgid="5904121494468643129">"Je nám ľúto, skúste to znova"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Služba je zaneprázdnená, skúste to znova"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 9520a5f..304eec3 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Zahteva za seznanitev Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Zahteva za seznanitev"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Izberite, če želite seznanitev z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Pokaži prejete datoteke"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Pokaži seznam datotek, prejetih prek povezave Bluetooth"</string>
     <string name="device_picker" msgid="8721012448931226323">"Izbirnik naprave Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Zahteva za dovoljenje za uporabo funkcije Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Program zahteva dovoljenje za vklop Bluetootha. Ali dovolite?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Izbira operaterja"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Izberite omrežnega operaterja"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum in ura"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Nastavitev datuma in ure"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Nastavitev datuma in ure"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Nastavi datum, uro, časovni pas in oblike"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Samodejna datum in ura"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Uporabi uro omrežja"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Nastavi Mojo lokacijo, odklepanje zaslona, zaklepanje kartice SIM, zaklepanje shrambe poverilnic"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavitev Moje lokacije, odklepanja zaslona, zaklepanja shrambe poverilnic"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Gesla"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifriranje naprave"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifriraj podatke v napravi"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifriraj podatke v napravi"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Nastaviti morate PIN ali geslo za odklepanje naprave"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Nastaviti morate PIN ali geslo za odklepanje naprave"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrirano"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Račune, nastavitve, prenesene programe in njihove podatke, predstavnostne in druge datoteke lahko šifrirate. Ko tablični računalnik enkrat šifrirate, ga lahko dešifrirate samo s ponastavitvijo na tovarniške nastavitve, pri čemer se izbrišejo vsi podatki v njem."\n\n"Šifriranje traja do eno uro. Postopek morate začeti z napolnjeno baterijo, računalnik pa imejte priključen na napajanje, dokler šifriranje ni končano. Če prekinete šifriranje, boste izgubili nekatere ali vse podatke."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Račune, nastavitve, prenesene programe in njihove podatke, predstavnostne in druge datoteke lahko šifrirate. Ko tablični računalnik enkrat šifrirate, ga lahko dešifrirate samo s ponastavitvijo na tovarniške nastavitve, pri čemer se izbrišejo vsi podatki v njem."\n\n"Šifriranje traja do eno uro. Postopek morate začeti z napolnjeno baterijo, računalnik pa imejte priključen na napajanje, dokler šifriranje ni končano. Če prekinete šifriranje, boste izgubili nekatere ali vse podatke."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifriraj tablični računalnik"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifriraj telefon"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Potrdite šifriranje"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Želite šifrirati uporabniške podatke? To dejanje je nepovratno in ga ni mogoče prekiniti brez izgube podatkov. Šifriranje traja do eno uro."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Želite šifrirati uporabniške podatke? To dejanje je nepovratno in ga ni mogoče prekiniti brez izgube podatkov. Šifriranje traja do eno uro."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifriranje"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Poskusite znova čez ^1 sek."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Nastavitev zaklepanja zaslona"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Nastavitev zaklepanja zaslona"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Nastavitve pomnilnika"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Izpni pomnilnik USB, prikaži razpoložljiv pomnilnik"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Izpenjanje kartice SD, prikaz razpoložljivega pomnilnika"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Moja telefonska številka"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Moja telefonska številka"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Različica seznama prednostnih omrežij za gostovanje"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Notranji pomnilnik"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Pomnilnik USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Kartica SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Razpoložljivi prostor"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Skupni prostor"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Na voljo"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Skupaj"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Izračunavanje ..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Uporaba programov"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Uporaba nosilcev podatkov"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Programi"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Predstavnost"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Izpni skupno shrambo"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Izpni kartico SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Izpni notranji pomnilnik USB"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"S tem boste iz "<b>"notranjega pomnilnika"</b>" tabličnega računalnika izbrisali vse podatke:"\n\n<li>"Google Račun"</li>\n<li>"podatke in nastavitve sistema in programov"</li>\n<li>"prenesene programe"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"S tem boste iz "<b>"notranjega pomnilnika"</b>" telefona izbrisali vse podatke:"\n\n<li>"Google Račun"</li>\n<li>"podatke in nastavitve sistema in programov"</li>\n<li>"prenesene programe"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni v te račune:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Glasba"</li>\n<li>"Fotografije"</li>\n<li>"Drugi uporabniški podatki"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Če želite izbrisati tudi glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"pomnilnik USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Če želite izbrisati tudi glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"kartico SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Izbriši pomnilnik USB"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Nastavitev in upravljanje navideznih zasebnih omrežij (VPN)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nespremenjeno)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ni nastavljeno)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Shramba poverilnic"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Uporabi zaščitene poverilnice"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Dovoli programom dostop do zaščitenih potrdil in drugih poverilnic"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Namesti s pogona USB"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Namesti s kartice SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Namesti šifrirana potrdila s pogona USB"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Namesti potrdila s kartice SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Nastavi geslo"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Nastavi ali spremeni geslo za shrambo poverilnic"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Počisti shrambo"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Počisti vso vsebino v shrambi poverilnic in ponastavi njeno geslo"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Nastavitev ali spreminjanje gesla za shrambo poverilnic"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Brisanje poverilnic"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Odstranitev vsebine in obnovitev gesla"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Vnesite geslo"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Vnesite geslo za shrambo poverilnic."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Vnesite geslo za shrambo poverilnic."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Nastavite geslo za shrambo poverilnic. Imeti mora vsaj 8 znakov."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutno geslo:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Novo geslo:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Potrdite novo geslo:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Ali ste prepričani, da želite izbrisati vse poverilnice in ponastaviti geslo shrambe poverilnic?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Vsebina bo izbrisana in geslo ponastavljeno. Ali ste prepričani, da želite to?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Gesli se ne ujemata."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Geslo mora imeti vsaj 8 znakov"</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Vnesite pravilno geslo."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Vnesite pravilno geslo. Še enkrat lahko poskusite, preden se shramba poverilnic izbriše."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"Shramba poverilnic je izbrisana."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Napoačno geslo."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Napačno geslo. Poskusite lahko še enkrat, preden se shramba poverilnic izbriše."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Napačno geslo. Poskusite lahko še <xliff:g id="NUMBER">%1$d</xliff:g>-krat, preden se shramba poverilnic izbriše."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Shramba poverilnic je izbrisana."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Shramba poverilnic je omogočena."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton v sili"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastavi način delovanja ob klicanju v sili"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Vzpostavljanje povezave ..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Naprej"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP ni podprt"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Povezave EAP Wi-Fi ne morete nastaviti med namestitvijo. To lahko po namestitvi naredite v nastavitvah v razdelku »Brezžično in omrežja«."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"EAP za povezavo Wi-Fi ni mogoče nastaviti med namestitvijo. Po namestitvi lahko to naredite v nastavitvah v razdelku "<b>"Brezžično in omrežja"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Vzpostavljanje povezave lahko traja nekaj minut ..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Če želite nadaljevati nastavitev, se dotaknite "<b>"Naprej"</b>"."\n\n"Če se želite povezati z drugim omrežjem Wi-Fi, se dotaknite "<b>"Nazaj"</b>"."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Nastavitve sinhronizacije"</string>
     <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Pri sinhronizaciji je prišlo do težav. Kmalu bo spet na voljo."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Dodaj račun"</string>
@@ -1405,7 +1390,7 @@
     <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Koledar"</string>
     <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Stiki"</string>
-    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Pozdravljeni v storitvi Google Sync."</font>" "\n"Googlov način sinhroniziranja podatkov, s katerim lahko dostopate do stikov, koledarskih vnosov in drugih podatkov, ne glede na to, kje ste."</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Pozdravljeni v storitvi Google Sync."</font>" "\n"Googlov način sinhroniziranja podatkov, s katerim lahko dostopate do stikov, koledarskih vnosov in drugih podatkov ne glede na to, kje ste."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Nastavitve sinhronizacije programov"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Podatki in sinhronizacija"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Spremeni geslo"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Sinhronizacija za ta element je trenutno onemogočena. Če želite spremeniti nastavitev, vklopite podatke v ozadju in samodejno sinhronizacijo."</string>
     <string name="enter_password" msgid="3268224850821675915">"Vnesite geslo za dešifriranje shrambe"</string>
     <string name="try_again" msgid="5904121494468643129">"Poskusite znova"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Storitev je zasedena, poskusite znova"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 209ced3..49a3237 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Захтев за Bluetooth упаривање"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Захтев за упаривање"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Изаберите за упаривање са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Приказ примљених датотека"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Приказ листе датотека примљених преко Bluetooth-а"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth бирач уређаја"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Захтев за Bluetooth дозволу"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Апликација захтева дозволу да укључи Bluetooth. Желите ли то да учините?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Избор оператера"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Избор мрежног оператера"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Датум и време"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Подешавање датума и времена"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Подешавање датума и времена"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Подешавање датума, времена, временске зоне и формата"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Аутоматски датум и време"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Користи време мреже"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Подешавање Моје локације, откључавања екрана, закључавања SIM картице и закључавања акредитива складишта"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Подешавање Моје локације, откључавања екрана, закључавања складишта акредитива"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Лозинке"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифровање уређаја"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифровање података на уређају"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Шифровање података на уређају"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Захтева да подесите PIN или лозинку за откључавање уређаја"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Захтева да подесите PIN или лозинку за откључавање уређаја"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Шифровано"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када шифрујете телефон, не можете да опозовете шифровање осим уколико не вратите фабричке податке, при чему ћете избрисати све податке на телефону."\n\n"Шифровање може да потраје највише један сат. Таблет треба да покренете са пуном батеријом и треба да буде прикључен на електричну мрежу док се шифровање не доврши. Уколико прекинете процес шифровања, изгубићете све податке или део њих."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када шифрујете телефон, не можете да опозовете шифровање осим уколико не вратите фабричке податке, при чему ћете избрисати све податке на телефону."\n\n"Шифровање може да потраје највише један сат. Таблет треба да покренете са пуном батеријом и треба да буде прикључен на електричну мрежу док се шифровање не доврши. Уколико прекинете процес шифровања, изгубићете све податке или део њих."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шифруј таблет"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шифруј телефон"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Потврда шифровања"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Желите ли да шифрујете корисничке податке? Ова радња је неопозива и не може се прекинути без губитка података! Шифровање може да потраје највише један сат."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Желите ли да шифрујете корисничке податке? Ова радња је неопозива и не може се прекинути без губитка података! Шифровање може да потраје највише један сат."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифровање"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Покушајте поново за ^1 секунде(и)."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Конфигурисање закључавања екрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Конфигурисање закључавања екрана"</string>
@@ -415,10 +410,10 @@
     <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Пренеси"</string>
     <string name="bluetooth_profile_hid" msgid="3000858580917633478">"Улазни уређај"</string>
     <string name="bluetooth_profile_pan" msgid="4225813400648547154">"Повезивање са Интернетом"</string>
-    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Уређај <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ће бити искључен са звука медија."</string>
-    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Уређај <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ће бити искључен са хендсфри звука."</string>
-    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Веза између уређаја <xliff:g id="DEVICE_NAME">%1$s</xliff:g> и улазног уређаја ће бити прекинута."</string>
-    <string name="bluetooth_disconnect_pan_profile" msgid="877883150720888525">"Интернет веза уређаја <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ће бити прекинута."</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Уређај <xliff:g id="DEVICE_NAME">%1$s</xliff:g>неће бити повезан на звука медија."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Уређај <xliff:g id="DEVICE_NAME">%1$s</xliff:g> неће бити повезан на хендсфри звук."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Уређај  <xliff:g id="DEVICE_NAME">%1$s</xliff:g> неће бити повезан на улазнои уређај."</string>
+    <string name="bluetooth_disconnect_pan_profile" msgid="877883150720888525">"Уређај  <xliff:g id="DEVICE_NAME">%1$s</xliff:g>неће бити повезан на Интернет."</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Опције за <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Радње уређаја"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Повежи"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Подешавања меморије"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Искључивање USB меморије, приказ доступне меморије"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Ослобађање SD картице, приказ доступног складишта"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Мој број телефона"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"Број мобилног директоријума"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Мој број телефона"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL верзија"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Интерна меморија"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB меморија"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD картица"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Доступан простор"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Укупан простор"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Доступно"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Укупно"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Прорачунавање..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Простор попуњен апликацијама"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Искоришћен меморијски простор"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Апликације"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Медији"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Искљ. дељене меморије"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Ослобађање SD картице"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Искљ. интерне USB меморије"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"На овај начин ће се избрисати сви подаци из "<b>"интерне меморије"</b>" таблета, укључујући:"\n\n<li>"Google налог"</li>\n<li>"податке и подешавања везана за систем и апликације"</li>\n<li>"преузете апликације"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"На овај начин ће се избрисати сви подаци из "<b>"интерне меморије"</b>" телефона, укључујући:"\n\n<li>"Google налог"</li>\n<li>"податке и подешавања везана за систем и апликације"</li>\n<li>"преузете апликације"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Тренутно сте пријављени на следеће налоге:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Фотографије"</li>\n<li>"Други кориснички подаци"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Ако желите да избришете и музику, слике и друге корисничке податке, мораћете да избришете садржај "<b>"USB меморије"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Ако желите да избришете и музику, слике и друге корисничке податке, мораћете да избришете садржај "<b>"SD картице"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Избриши USB меморију"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Подешавање и управљање виртуелним приватним мрежама (VPN)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(непромењено)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(није подешено)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Складиште акредитива"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Коришћење безбедносних акредитива"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Дозвољавање да апликације приступе безбедносним сертификатима и другим акредитивима"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Инсталирање из USB меморије"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Инсталирање са SD картице"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Инсталирање сертификата из USB меморије"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Инсталирање сертификата са SD картице"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Подешавање лозинке"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Подешавање или промена лозинке за складиште акредитива"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Брисање складишта"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Брисање свог садржаја из складишта акредитива и поновно постављање лозинке"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Подешавање или промена лозинке за складиште акредитива"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Брисање акредитива"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Уклањање целокупног садржаја и поновно постављање лозинке"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Унос лозинке"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Уношење лозинке за складиште акредитива."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Унесите лозинку за складиште акредитива."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Подесите лозинку за складиште акредитива. Мора да има најмање 8 знакова."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Тренутна лозинка:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Нова лозинка:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Потврдите нову лозинку:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Желите ли заиста да избришете све акредитиве и поново поставите лозинку за складиште акредитива?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Сав садржај ће бити уклоњен, а лозинка ће бити поново постављена. Јесте ли сигурни да то желите?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Лозинке се не подударају."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Лозинка мора да има најмање 8 знакова."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Унесите тачну лозинку."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Унесите тачну лозинку. Имате још један покушај да унесете тачну лозинку пре брисања складишта акредитива."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"Складиште акредитива је избрисано."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Нетачна лозинка."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Нетачна лозинка. Имате још један унос пре брисања складишта акредитива."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Нетачна лозинка. Имате још <xliff:g id="NUMBER">%1$d</xliff:g> уноса пре брисања складишта акредитива."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Складиште акред. је избрисано."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Складиште акредитива је омогућено."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тон за хитне позиве"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Подешавање понашања када се успоставља хитни позив"</string>
@@ -1353,7 +1340,7 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Обавештења"</string>
     <string name="sound_category_feedback_title" msgid="4399742321363475393">"Повратне информације"</string>
     <string name="wifi_setup_title" msgid="661074868726906436">"Подешавање Wi-Fi везе"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Повежи се са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Повежи са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Повезивање са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
     <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Успостављена је веза са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Додавање мреже"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Повезивање..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Пређите на следећи корак"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP није подржан"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Не можете да конфигуришете EAP Wi-Fi везу током подешавања. Након подешавања, то можете да урадите у Подешавањима, у менију Бежична веза и мреже."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Не можете да конфигуришете EAP Wi-Fi везу током инсталације. Након инсталације, то можете да урадите у Подешавањима у склопу ставке "<b>"Бежична веза и мреже"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Повезивање може да потраје неколико минута..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Додирните "<b>"Следеће"</b>" да бисте наставили са подешавањем."\n\n"Додирните "<b>"Назад"</b>" да бисте се повезали са другом Wi-Fi мрежом."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Подешавања сихронизације"</string>
     <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Синхронизација тренутно има проблема. Ускоро ће се вратити."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Додај налог"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Синхронизација за ову ставку је тренутно онемогућена. Да бисте променили подешавање, привремено укључите позадинске податке и аутоматско синхронизовање."</string>
     <string name="enter_password" msgid="3268224850821675915">"Унесите лозинку да бисте дешифровали меморију"</string>
     <string name="try_again" msgid="5904121494468643129">"Жао нам је, покушајте поново"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Услуга је заузета. Покушајте поново"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c1e0fef..5403235 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -268,43 +268,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ställ in Min plats, skärmupplåsning, lås för SIM-kort och lås för uppgiftslagring"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ställ in Min plats, skärmupplåsning, lås för uppgiftslagring"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Lösenord"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enhetskryptering"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kryptera data på enheten"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kryptera data på enheten"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Du måste ange PIN-kod eller lösenord för upplåsning av enheten."</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Du måste ange PIN-kod eller lösenord för upplåsning av enheten."</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krypterad"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Du kan kryptera dina konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du har krypterat telefonen går det inte att dekryptera den utan att återställa standardinställningarna, vilket leder till att alla data på telefonen tas bort."\n\n"Krypteringen kan ta upp till en timme. Se till att batteriet är laddat innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter krypteringen kan du förlora en del av eller alla dina data."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Du kan kryptera dina konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du har krypterat telefonen går det inte att dekryptera den utan att återställa standardinställningarna, vilket leder till att alla data på telefonen tas bort."\n\n"Krypteringen kan ta upp till en timme. Se till att batteriet är laddat innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter krypteringen kan du förlora en del av eller alla dina data."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Kryptera pekdatorn"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Kryptera telefonen"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Bekräfta kryptering"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Kryptera användardata? Det går inte att ångra åtgärden och om förloppet avbryts går data förlorade! Krypteringen kan ta upp till en timme."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Kryptera användardata? Det går inte att ångra åtgärden och om förloppet avbryts går data förlorade! Krypteringen kan ta upp till en timme."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Krypterar"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Försök igen om ^1 sekunder."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Konfigurera skärmlåset"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Konfigurera skärmlåset"</string>
@@ -573,7 +570,7 @@
     <string name="dock_settings_title" msgid="9161438664257429372">"Dockningsinställningar"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Ljud"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Inställningar för ansluten skrivbordsdocka"</string>
-    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Inställningar för ansluten bildocka"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Inställningar för dockningsstation för bil"</string>
     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Pekdatorn är inte dockad"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefonen är inte dockad"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Inställningar för ansluten dockningsenhet"</string>
@@ -663,8 +660,8 @@
     <string name="internal_memory" msgid="9129595691484260784">"Intern lagring"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-lagring"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kort"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Tillgängligt utrymme"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Totalt utrymme"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Tillgängligt"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Totalt"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Beräknas..."</string>
     <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Appanvändning"</string>
     <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Medieanvändning"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index c325446..0edd97d 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"คำขอกำหนดค่าอุปกรณ์ให้ตรงกันทางบลูทูธ"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"คำขอกำหนดค่าอุปกรณ์ให้ตรงกัน"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"เลือกกำหนดค่าอุปกรณ์ให้ตรงกับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"แสดงไฟล์ที่ได้รับ"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"แสดงรายการไฟล์ที่ได้รับผ่านบลูทูธ"</string>
     <string name="device_picker" msgid="8721012448931226323">"ตัวเลือกอุปกรณ์บลูทูธ"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"คำขออนุญาตใช้บลูทูธ"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"แอปพลิเคชันกำลังขออนุญาตเปิดใช้บลูทูธ คุณต้องการดำเนินการนี้หรือไม่"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"การเลือกผู้ให้บริการ"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"เลือกผู้ให้บริการเครือข่าย"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"เวลาและวันที่"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"ตั้งวันที่และเวลา"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"ตั้งวันที่และเวลา"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"ตั้งวันที่ เวลา เขตเวลาและรูปแบบ"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"วันที่และเวลาอัตโนมัติ"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"ใช้เวลาที่ระบุโดยเครือข่าย"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ตั้งค่าตำแหน่งของฉัน การปลดล็อกหน้าจอ การล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"รหัสผ่าน"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"การเข้ารหัสอุปกรณ์"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"เข้ารหัสข้อมูลบนอุปกรณ์"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"เข้ารหัสข้อมูลบนอุปกรณ์"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"คุณจำเป็นต้องตั้งค่า PIN หรือรหัสผ่านเพื่อปลดล็อกอุปกรณ์"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"คุณจำเป็นต้องตั้งค่า PIN หรือรหัสผ่านเพื่อปลดล็อกอุปกรณ์"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"ที่เข้ารหัส"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ของแอปพลิเคชันได้ เมื่อคุณเข้ารหัสโทรศัพท์ คุณจะไม่สามารถยกเลิกการเข้ารหัสได้ยกเว้นด้วยการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะลบข้อมูลทั้งหมดในโทรศัพท์ของคุณ"\n\n"การเข้ารหัสใช้เวลาประมาณหนึ่งชั่วโมง คุณจะต้องเริ่มดำเนินการโดยใช้แบตเตอรี่ที่ชาร์จจนเต็มและเสียบปลั๊กแท็บเล็ตของคุณไว้จนกว่าการเข้ารหัสจะเสร็จสิ้น หากขั้นตอนการเข้ารหัสหยุดชะงัก ข้อมูลบางส่วนหรือทั้งหมดของคุณจะสูญหาย"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ของแอปพลิเคชันได้ เมื่อคุณเข้ารหัสโทรศัพท์ คุณจะไม่สามารถยกเลิกการเข้ารหัสได้ยกเว้นด้วยการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะลบข้อมูลทั้งหมดในโทรศัพท์ของคุณ"\n\n"การเข้ารหัสใช้เวลาประมาณหนึ่งชั่วโมง คุณจะต้องเริ่มดำเนินการโดยใช้แบตเตอรี่ที่ชาร์จจนเต็มและเสียบปลั๊กแท็บเล็ตของคุณไว้จนกว่าการเข้ารหัสจะเสร็จสิ้น หากขั้นตอนการเข้ารหัสหยุดชะงัก ข้อมูลบางส่วนหรือทั้งหมดของคุณจะสูญหาย"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"เข้ารหัสแท็บเล็ต"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"เข้ารหัสโทรศัพท์"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"ยืนยันการเข้ารหัส"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"เข้ารหัสข้อมูลผู้ใช้หรือไม่ การทำงานนี้ไม่สามารถย้อนกลับได้และข้อมูลจะสูญหายหากการดำเนินการหยุดชะงัก การเข้ารหัสจะใช้เวลาประมาณหนึ่งชั่วโมง"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"เข้ารหัสข้อมูลผู้ใช้หรือไม่ การทำงานนี้ไม่สามารถย้อนกลับได้และข้อมูลจะสูญหายหากการดำเนินการหยุดชะงัก การเข้ารหัสจะใช้เวลาประมาณหนึ่งชั่วโมง"</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"กำลังเข้ารหัส"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"ลองใหม่อีกครั้งใน ^1 วินาที"</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"กำหนดค่าการล็อคหน้าจอ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"กำหนดค่าการล็อคหน้าจอ"</string>
@@ -384,7 +379,7 @@
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"การตั้งค่าบลูทูธ"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"จัดการการเชื่อมต่อ ตั้งชื่ออุปกรณ์และการค้นพบ"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"คำขอกำหนดค่าอุปกรณ์ให้ตรงกันทางบลูทูธ"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"ป้อน PIN เพื่อจับคู่อุปกรณ์ให้ตรงกับ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" (ลองป้อน 0000 หรือ 1234) คุณอาจจำเป็นต้องป้อน PIN ที่ตรงกันบนอุปกรณ์บลูทูธ"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"ป้อน PIN เพื่อจับคู่อุปกรณ์กับ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" (ลองป้อน 0000 หรือ 1234) คุณอาจจำเป็นต้องป้อน PIN ที่ตรงกันบนอุปกรณ์บลูทูธ"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="8301499416158195044">\n"ป้อนรหัสผ่านเพื่อกำหนดค่าอุปกรณ์ให้ตรงกับ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"หากต้องการกำหนดค่าอุปกรณ์ให้ตรงกับ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ยืนยันว่าอุปกรณ์กำลังแสดงรหัสผ่าน:<xliff:g id="PASSKEY">%2$s</xliff:g>"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n" ต้องการกำหนดค่าอุปกรณ์ให้ตรงกัน"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"การตั้งค่าที่เก็บข้อมูล"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"ยกเลิกการต่อเชื่อมที่เก็บข้อมูล USB ดูที่เก็บข้อมูลที่ใช้งานได้"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"ยกเลิกการต่อเชื่อมการ์ด SD ดูที่จัดเก็บข้อมูลที่ใช้ได้"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"หมายเลขโทรศัพท์ของฉัน"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"หมายเลขโทรศัพท์ของฉัน"</string>
     <string name="status_min_number" msgid="3519504522179420597">"นาที"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"รุ่น PRL"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"ที่เก็บข้อมูลภายใน"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"ที่เก็บข้อมูล USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"การ์ด SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"พื้นที่ว่าง"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"พื้นที่ทั้งหมด"</string>
+    <string name="memory_available" msgid="5052397223077021181">"ว่าง"</string>
+    <string name="memory_size" msgid="5458889090691922288">"ทั้งหมด"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"กำลังคำนวณ..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"การใช้แอปพลิเคชัน"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"การใช้สื่อ"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"แอปพลิเคชัน"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"สื่อ"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"ยกเลิกการต่อเชื่อมที่เก็บข้อมูลที่ใช้ร่วมกัน"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"ยกเลิกการต่อเชื่อมการ์ด SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"ยกเลิกการต่อเชื่อมที่เก็บข้อมูล USB ภายใน"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"การทำงานนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่เก็บข้อมูลภายใน"</b>"แท็บเล็ต รวมทั้ง:"\n\n<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลดไว้"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"การทำงานนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่เก็บข้อมูลภายใน"</b>"โทรศัพท์ รวมทั้ง:"\n\n<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลดไว้"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ขณะนี้คุณได้ลงชื่อเข้าใช้บัญชีต่อไปนี้แล้ว:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"เพลง"</li>\n<li>"รูปภาพ"</li>\n<li>"ข้อมูลผู้ใช้อื่นๆ"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ ด้วย จะต้องลบ "<b>"ที่เก็บข้อมูล USB"</b></string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ ด้วย ต้องลบ"<b>"การ์ด SD"</b></string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"ลบที่เก็บข้อมูล USB"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"ตั้งค่าและจัดการ VPN"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(ไม่เปลี่ยน)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ไม่ได้ตั้งค่า)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"ที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="credentials_access" msgid="4843187230913860492">"ใช้ข้อมูลรับรองความปลอดภัย"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"อนุญาตให้แอปพลิเคชันนี้เข้าถึงใบรับรองความปลอดภัยและข้อมูลรับรองอื่น"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"ติดตั้งจากที่จัดเก็บข้อมูล USB"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"ติดตั้งจากการ์ด SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"ติดตั้งใบรับรองจากที่จัดเก็บข้อมูล USB"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"ติดตั้งใบรับรองจากการ์ด SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"ตั้งค่ารหัสผ่าน"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"ตั้งค่าหรือเปลี่ยนรหัสผ่านที่จัดเก็บข้อมูลรับรอง"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"ล้างที่จัดเก็บข้อมูล"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"ล้างข้อมูลทั้งหมดในที่จัดเก็บข้อมูลรับรองและรีเซ็ตรหัสผ่าน"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"ตั้งหรือเปลี่ยนรหัสผ่านสำหรับที่จัดเก็บข้อมูลรับรอง"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"ล้างข้อมูลรับรอง"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"นำข้อมูลทั้งหมดออกและรีเซ็ตรหัสผ่าน"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"ป้อนรหัสผ่าน"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"ป้อนรหัสผ่านที่จัดเก็บข้อมูลรับรอง"</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"ใส่รหัสผ่านสำหรับที่จัดเก็บข้อมูลรับรอง"</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"ตั้งรหัสผ่านสำหรับที่จัดเก็บข้อมูลรับรอง ต้องมีอย่างน้อย 8 อักขระ"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"รหัสผ่านปัจจุบัน:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"รหัสผ่านใหม่:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"ยืนยันรหัสผ่านใหม่:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"คุณแน่ใจหรือไม่ว่าต้องการลบข้อมูลรับรองทั้งหมดและรีเซ็ตรหัสผ่านที่เก็บข้อมูลรับรอง"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"เนื้อหาทั้งหมดจะถูกลบและมีการรีเซ็ตรหัสผ่านนี้ คุณแน่ใจหรือไม่"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"รหัสผ่านของคุณไม่ตรง"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"รหัสผ่านต้องมีอักขระอย่างน้อย 8 ตัว"</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"โปรดป้อนรหัสผ่านที่ถูกต้อง"</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"โปรดป้อนรหัสผ่านที่ถูกต้อง คุณลองป้อนรหัสผ่านที่ถูกต้องได้อีกหนึ่งครั้งก่อนที่ที่จัดเก็บข้อมูลรับรองจะถูกลบ"</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"ที่จัดเก็บข้อมูลรับรองถูกลบ"</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"รหัสผ่านไม่ถูกต้อง"</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"รหัสผ่านไม่ถูกต้อง คุณมีโอกาสหนึ่งครั้งก่อนที่ที่จัดเก็บข้อมูลรับรองจะถูกลบ"</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"รหัสผ่านไม่ถูกต้อง คุณมีโอกาสอีก <xliff:g id="NUMBER">%1$d</xliff:g> ครั้งก่อนที่ที่จัดเก็บข้อมูลรับรองจะถูกลบ"</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"ที่จัดเก็บข้อมูลรับรองถูกลบ"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"เปิดการใช้งานที่จัดเก็บข้อมูลรับรองไว้"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"โทนเสียงฉุกเฉิน"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ตั้งค่าการทำงานเมื่อมีการโทรหาหมายเลขฉุกเฉิน"</string>
@@ -1355,7 +1342,7 @@
     <string name="wifi_setup_title" msgid="661074868726906436">"ตั้งค่า Wi-Fi"</string>
     <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"เชื่อมต่อกับเครือข่าย Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"กำลังเชื่อมต่อกับเครือข่าย Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> ..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"เชื่อมต่อกับกับเครือข่าย Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> แล้ว"</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"เชื่อมต่อกับเครือข่าย Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> แล้ว"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"เพิ่มเครือข่าย"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"ไม่เชื่อมต่อ"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"เพิ่มเครือข่าย"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"กำลังเชื่อมต่อ..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"ดำเนินการต่อไปยังขั้นตอนถัดไป"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"ไม่สนับสนุน EAP"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"คุณไม่สามารถกำหนดค่าการเชื่อมต่อ EAP Wi-Fi ในขณะตั้งค่าได้ หลังจากการตั้งค่า คุณสามารถกำหนดค่าการเชื่อมต่อได้ใน การตั้งค่า ในส่วนของ ไร้สายและเครือข่าย"</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"คุณไม่สามารถกำหนดค่าการเชื่อมต่อ EAP Wi-Fi ขณะตั้งค่าหลังการตั้งค่า คุณสามารถกำหนดค่าได้ในการตั้งค่า ในส่วน "<b>"ไร้สายและเครือข่าย"</b></string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"การเชื่อมต่อจะใช้เวลาสักครู่..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"แตะ "<b>"ถัดไป"</b>" เพื่อตั้งค่าต่อไป"\n\n"แตะ "<b>"ย้อนกลับ"</b>" เพื่อเชื่อมต่อกับเครือข่าย Wi-Fi อื่น"</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"การตั้งค่าการซิงค์"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"การซิงค์กำลังประสบปัญหา อีกสักครู่จะกลับมาอีกครั้ง"</string>
     <string name="add_account_label" msgid="7811707265834013767">"เพิ่มบัญชี"</string>
@@ -1421,9 +1406,8 @@
     <string name="provider_label" msgid="7724593781904508866">"การสมัครรับข้อมูลแบบ Push"</string>
     <string name="sync_item_title" msgid="1931551540462877488">"ซิงค์ <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="7185199796123573317">"ซิงค์ด้วยตนเองไม่ได้"</string>
-    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"การซิงค์สำหรับรายการนี้ถูกปิดใช้งานในขณะนี้ หากต้องการเปลี่ยนค่ากำหนดของคุณ ให้เปิดใช้งานข้อมูลพื้นหลังและการซิงค์อัตโนมัติชั่วคราว"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"การซิงค์สำหรับรายการนี้ถูกปิดใช้งานในปัจจุบัน หากต้องการเปลี่ยนค่ากำหนดของคุณ ให้เปิดใช้งานข้อมูลพื้นหลังและการซิงค์อัตโนมัติชั่วคราว"</string>
     <string name="enter_password" msgid="3268224850821675915">"ป้อนรหัสผ่านเพื่อถอดรหัสที่เก็บข้อมูล"</string>
     <string name="try_again" msgid="5904121494468643129">"ขออภัย โปรดลองอีกครั้ง"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"บริการไม่ว่าง โปรดลองอีกครั้ง"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 2153be5..27ddb3b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Kahilingan sa pagpapares ng bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Kahilingan sa pagpares"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Piliin upang ipares sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Ipakita mga natanggap na file"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Ipakita lista ng file na natanggap sa Bluetooth"</string>
     <string name="device_picker" msgid="8721012448931226323">"Tagapili ng device ng bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Kahilingan sa pahintulot ng bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Humihiling ang application ng pahintulot na i-on ang Bluetooth. Gusto mo ba itong gawin?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Pagpipilian ng operator"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Pumili ng network operator"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Petsa &amp; oras"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Itakda ang Petsa at oras"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Magtakda ng petsa at oras"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Itakda ang petsa, oras, time zone &amp; mga format"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Awto petsa &amp; oras"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Gamitin ang oras na ibinigay ng network"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng SIM card, lock ng imbakan ng kredensyal"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng imbakan ng kredensyal"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mga Password"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Pag-encrypt ng device"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"I-encrypt ang data sa device"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"I-encrypt ang data sa device"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Kailangan mong magtakda ng pin sa pag-unlock ng device o password"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Kailangan mong magtakda ng pin sa pag-unlock ng device o password"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Na-encrypt"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na application at kanilang data, media, at ibang file. Sa sandaling i-encrypt mo ang iyong telepono, hindi mo ito maaaring i-unencrypt maliban sa pagsasagawa ng pag-reset ng data sa pabrika, na bumubura sa lahat ng data sa iyong telepono."\n\n"Tumatagal ang pag-encrypt nang hanggang sa isang oras. Dapat kang magsimula na may nakargahang baterya at panatiliing nakakabit ang iyong telepono hanggang sa makumpleto ang pag-encrypt. Kung gambalain mo ang proseso ng pag-encrypt, mawawala sa iyo ang ilan o lahat ng iyong data."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na application at kanilang data, media, at ibang file. Sa sandaling i-encrypt mo ang iyong telepono, hindi mo ito maaaring i-unencrypt maliban sa pagsasagawa ng pag-reset ng data sa pabrika, na bumubura sa lahat ng data sa iyong telepono."\n\n"Tumatagal ang pag-encrypt nang hanggang sa isang oras. Dapat kang magsimula na may nakargahang baterya at panatiliing nakakabit ang iyong telepono hanggang sa makumpleto ang pag-encrypt. Kung gambalain mo ang proseso ng pag-encrypt, mawawala sa iyo ang ilan o lahat ng iyong data."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"I-encrypt ang tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"I-encrypt ang telepono"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Kumpirmahin ang pag-encrypt"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"I-encrypt ang data ng user? Hindi mababawi ang pagpapatakbong ito at maaaring hindi gambalain ng hindi nawawalan ng data! Maaaring tumagal ang pag-encrypt nang hanggang sa isang oras."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"I-encrypt ang data ng user? Hindi mababawi ang pagpapatakbong ito at maaaring hindi gambalain ng hindi nawawalan ng data! Maaaring tumagal ang pag-encrypt nang hanggang sa isang oras."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Pag-encrypt"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Subukang muli pagkalipas ng ^1 segundo."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"I-configure ang screen ng lock"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"I-configure ang screen ng lock"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Mga setting ng imbakan"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"I-unmount ang imbakan na USB, tingnan ang available na imbakan"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"I-unmount ang SD card, tingnan ang available na imbakan"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Numero ng aking telepono"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Numero ng aking telepono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Bersyon ng PRL"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Panloob imbakan"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Imbakan na USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD card"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Available na espasyo"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Kabuuang espasyo"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Available"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Kabuuan"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Kinakalkula..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Paggamit ng application"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Paggamit ng media"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Mga Application"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Unmount nabahagi imbakan"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"I-unmount ang SD card"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"I-unmount panloob USB storage"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na imbakan"</b>" ng iyong telepono, kabilang ang:"\n\n<li>"Iyong Google account"</li>\n<li>"Mga data at setting ng system at application"</li>\n<li>"Mga na-download na application"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na imbakan"</b>" ng iyong telepono, kabilang ang:"\n\n<li>"Iyong Google account"</li>\n<li>"Mga data at setting ng system at application"</li>\n<li>"Mga na-download na application"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kasalukuyan kang naka-sign in sa mga sumusunod na account:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musika"</li>\n<li>"Mga Larawan"</li>\n<li>"Ibang data ng user"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Upang i-clear din ang musika, mga larawan, at ibang data ng user, kailangang mabura ang "<b>"imbakan na USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Upang i-clear din ang musika, mga larawan, at ibang data ng user, kailangang mabura ang "<b>"SD card"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Burahin ang imbakan na USB"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"I-set up &amp; pamahalaan ang Mga Virtual Private Networks (mga VPN)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(di-nabago)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(hindi nakatakda)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Imbakan ng kredensyal"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Gumamit ng mga secure na kredensyal"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Payagan ang mga application upang ma-access ang mga secure na certificate at iba pang mga kredensyal"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"I-install mula sa USB storage"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"I-install mula sa SD card"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Mag-install ng mga certificate mula sa USB storage"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Mag-install ng mga certificate mula sa SD card"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Itakda ang password"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Itakda o baguhin ang password ng imbakan ng kredensyal"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"I-clear ang imbakan"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"I-clear ang imbakan ng kredensyal ng lahat ng mga nilalaman at i-reset ang password nito"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Itakda o baguhin ang password para sa imbakan ng kredensyal"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"I-clear ang mga kredensyal"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Alisin ang lahat ng mga nilalaman at i-reset ang password"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Magpasok ng password"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ipasok ang password ng imbakan ng kredensyal."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ipasok ang password para sa imbakan ng kredensyal."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Itakda ang password para sa imbakan ng kredensyal. Dapat na mayroon itong hindi bababa sa 8 character."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Kasalukuyang password:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Bagong password:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Kumpirmahin ang bagong password:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Sigurado ka bang gusto mong tanggalin ang lahat ng mga kredensyal at i-reset ang password ng imbakan ng kredensyal?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Maaalis ang lahat ng mga nilalaman, at mare-reset ang password. Sigurado ka ba tungkol doon?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Hindi tumutugma ang iyong mga password."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Dapat na may hindi bababa sa 8 character ang password."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Pakipasok ang tamang password."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Pakipasok ang tamang password. Mayroon ka pang isang pagsubok upang ipasok ang tamang password bago mabura ang imbakan ng kredensyal."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"Binura ang imbakan ng kredensyal."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Hindi tamang password."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Hindi tamang password. Mayroon kang isa pang pagkakataon bago mabura ang imbakan ng kredensyal."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Hindi tamang password. Mayroon kang <xliff:g id="NUMBER">%1$d</xliff:g> pang pagkakataon bago mabura ang imbakan ng kredensyal."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Binura imbakan ng kredensyal."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Pinagana ang imbakan ng kredensyal."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tonong pang-emergency"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Itakda ang pag-uugali kapag naganap ang isang pang-emergency na tawag"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Kumukonekta..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Magpatuloy sa susunod na hakbang"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"Hindi suportado ang EAP"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Hindi ka maka-configure ng koneksyon ng EAP Wi-Fi sa panahon ng pag-setup. Pagkatapos ng pag-setup, maaari mo iyong gawin sa Mga Setting, sa ilalim ng Mga Wireless &amp; Network."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Hindi ka maaaring mag-configure ng koneksyon sa EAP Wi-Fi sa panahon ng setup. Pagkatapos ng setup, maaari mong gawin iyon sa Mga Setting, sa ilalim ng "<b>"Mga wireless at network"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Maaaring tumagal ang pagkonekta nang ilang minuto..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Pindutin ang "<b>"Susunod"</b>" upang magpatuloy sa setup."\n\n"Pindutin ang "<b>"Bumalik"</b>" upang kumonekta sa ibang network ng Wi-Fi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Mga setting ng pag-sync"</string>
     <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Kasalukuyang nakakaranas ng mga problema ang pag-sync. Babalik ito sa ilang saglit."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Magdagdag ng account"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Kasalukuyang hindi pinagana ang pag-sync para sa item na ito. Upang palitan ang iyong kagustuhan, pansamantalang i-on ang data ng background at awtomatikong sync."</string>
     <string name="enter_password" msgid="3268224850821675915">"Ilagay ang password upang i-decrypt ang imbakan"</string>
     <string name="try_again" msgid="5904121494468643129">"Paumanhin, subukang muli"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Busy ang serbisyo, subukang muli"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1cfa543..4e3b13d 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth eşleşme isteği"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Eşleşme isteği"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleştirmek için seçin"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Alınan dosyaları göster"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Bluetooth üzerinden alınan dosyaların listesini göster"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth cihazı seçicisi"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth izin isteği"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Bir uygulama, Bluetooth\'u açmak için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Operatör seçimi"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Bir ağ operatörü seçin"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Tarih ve saat"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Tarihi ve saati ayarlayın"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Tarih ve saati ayarla"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Tarihi, saati, saat dilimini ve biçimleri ayarla"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Otomatik tarih ve saat"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Ağ tarafından sağlanan saati kullan"</string>
@@ -258,7 +256,7 @@
     <string name="date_picker_title" msgid="1338210036394128512">"Tarih"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Saat"</string>
     <string name="lock_after_timeout" msgid="940509402681580537">"Zaman aşımı"</string>
-    <string name="lock_after_timeout_summary" msgid="4726009794344934278">"Kilit ekranı <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> sonra ekran otomatik olarak kapanır"</string>
+    <string name="lock_after_timeout_summary" msgid="4726009794344934278">"Ekran otomatik olarak kapandıktan <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> sonra ekranı kilitle"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Kilitli ekranda sahip bilgilerini göster"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Sahip bilgileri"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Konumum, ekran kil. açma, SIM kart kil., kim. bilg. dep.kilidini ayarla"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Konumum, ekran kilidi açma, kimlik bilgileri deposunun kilidi özelliklerini ayarla"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Şifreler"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Cihaz şifreleme"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Cihazdaki verileri şifrele"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Cihazdaki verileri şifrele"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Cihazın kilidini açacak pin veya şifreyi ayarlamanızı gerektirir"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Cihazın kilidini açacak pin veya şifreyi ayarlamanızı gerektirir"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Şifreli"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri medyaları ve diğer dosyaları şifreleyebilirsiniz. Telefonunuzu şifreledikten sonra, telefonunuzdaki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız."\n\n"Şifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar telefonu fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri medyaları ve diğer dosyaları şifreleyebilirsiniz. Telefonunuzu şifreledikten sonra, telefonunuzdaki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız."\n\n"Şifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar telefonu fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Şifreli tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Şifreli telefon"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Şifrelemeyi onaylayın"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Kullanıcı verileri şifrelensin mi? Bu işlem geri alınamaz ve veri kaybı olmadan yarıda kesilemez! Şifreleme bir saat kadar sürebilir."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Kullanıcı verileri şifrelensin mi? Bu işlem geri alınamaz ve veri kaybı olmadan yarıda kesilemez! Şifreleme bir saat kadar sürebilir."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Şifreleniyor"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"^1 saniye içinde tekrar deneyin."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Kilit ekranını yapılandır"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Kilit ekrn yapılandır"</string>
@@ -418,7 +413,7 @@
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> medya ses profilinden ayrılacak."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> eller serbest ses profilinden ayrılacak."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> giriş cihazından ayrılacak."</string>
-    <string name="bluetooth_disconnect_pan_profile" msgid="877883150720888525">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> internet paylaşımdan ayrılacak."</string>
+    <string name="bluetooth_disconnect_pan_profile" msgid="877883150720888525">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> internet paylaşımından ayrılacak."</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> seçenek"</string>
     <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Cihaz eylemleri"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Bağlan"</string>
@@ -436,7 +431,7 @@
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Telefon sesi için kullan"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Dosya aktarımı için kullan"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Giriş için kullan"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"İnternet erişimi için kullan."</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"İnternet erişimi için kullan"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Yuva Ayarları"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Ses öğesi için yuvayı kullan"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefon hoparlörü olarak"</string>
@@ -471,7 +466,7 @@
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Erişim noktasının PIN\'ini girin"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS Ayarı"</string>
     <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Erişim noktasında <xliff:g id="WPS_PIN">%1$s</xliff:g> PIN\'ini girin"</string>
-    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS zaten devam ediyor ve tamamlanması onlarca saniye sürebilir."</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS zaten devam ediyor ve tamamlanması onlarca saniye sürebilir"</string>
     <string name="wifi_wps_failed" msgid="2277409652621482331">"WPS başlatılamadı. Lütfen tekrar deneyin"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Ağ SSID\'si"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Güvenlik"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Depolama ayarları"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB depolama biriminin bağlantısını kes, kullanılabilir depolama alanını görüntüle"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD kartın bağlantısını kes, kull. Depolama alanını görüntüle"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Telefon numaram"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Telefon numaram"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MİN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL Sürümü"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Dahili dep birm"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB depolama birimi"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD kart"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Kullanılabilir alan"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Toplam alan"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Kullanılabilir"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Toplam"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Hesaplanıyor..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Uygulama kullanımı"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Medya kullanımı"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Uygulamalar"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Medya"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Payl dep birimnn bağl kes"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD kartının bağlantısını kes"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Dahili USB depolamanın bağ kes"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Bu işlem tablet bilgisayarınızın "<b>"dahili depolama alanından"</b>" şu verilerin tümünü siler:"\n\n<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Bu işlem telefonunuzun "<b>"dahili depolama alanından"</b>" şu verilerini tümünü siler:"\n\n<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ve ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Şu anda aşağıdaki hesaplarda oturum açmış durumdasınız:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Müzik"</li>\n<li>"Fotoğraflar"</li>\n<li>"Diğer kullanıcı verileri"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin de temizlenmesi için "<b>"USB depolama biriminin"</b>" silinmesi gerekir."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Müzik, resim ve diğer kullanıcı verilerini de temizlemek için, "<b>"SD kartın"</b>" silinmesi gerekir."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB depolama birimini sil"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Sanal Özel Ağlar (VPN\'ler) kur ve yönet"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(değişmedi)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ayarlanmadı)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Kimlik bilgileri deposu"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Güvenli kimlik bilgilerini kullan"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Uygulamaların güvenli sertifikalara ve diğer kimlik bilgilerine erişmesine izin verin"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"USB depolama biriminden yükle"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"SD karttan yükle"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Sertifikaları USB depolama biriminden yükle"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Sertifikaları SD karttan yükle"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Şifreyi ayarla"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Kimlik bilgileri deposunun şifresini ayarlayın veya değiştirin"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Depoyu temizle"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Tüm içeriklerin kimlik bilgileri deposunu temizleyin ve bu depolama alanının şifresini sıfırlayın"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Kimlik bilgileri deposu için şifre ayarla veya mevcut şifreyi değiştir"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Kimlik bilgilerini temizle"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Tüm içeriği kaldır ve şifreyi sıfırla"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Şifreyi girin"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Kimlik bilgileri deposunun şifresini girin."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Kimlik bilgileri deposu için şifre girin."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Kimlik bilgileri deposu için şifreyi girin. En az 8 karakter olmalıdır."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Geçerli şifre:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Yeni şifre:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Yeni şifreyi doğrulayın:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Tüm kimlik bilgilerini silmek ve kimlik bilgileri deposunun şifresini sıfırlamak istediğinizden emin misiniz?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Tüm içerik kaldırılacak ve şifre sıfırlanacak. Bundan emin misiniz?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Şifreler eşleşmiyor."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Şifre, en az 8 karakterden oluşmalıdır."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Lütfen doğru şifreyi girin."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Lütfen doğru şifreyi girin. Kimlik bilgileri deposu silinmeden önce doğru şifreyi girmek için son bir deneme hakkınız var."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"Kimlik bilgileri deposu silindi."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Yanlış şifre."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Hatalı şifre. Kimlik bilgileri deposu silinmeden önce tek bir şansınız kaldı."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Hatalı şifre. Kimlik bilgileri deposu silinmeden önce <xliff:g id="NUMBER">%1$d</xliff:g> şansınız kaldı."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Kimlik bilgileri deposu silindi."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Kimlik bilgileri deposu etkin."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Acil sesi"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Acil çağrı yapıldığında nasıl işlev göreceğini ayarlayın"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Bağlanıyor..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Sonraki adıma ilerle"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP desteklenmiyor"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Kurulum sırasında Kablosuz EAP bağlantısı yapılandıramazsınız. Kurulumdan sonra Kablosuz ve Ağlar altında Ayarlar bölümünden bunu yapabilirsiniz."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Kurulum sırasında EAP Kablosuz bağlantısı yapılandıramazsınız. Kurulumdan sonra Ayarlar\'da, "<b>"Kablosuz ve ağlar"</b>" bölümünden yapabilirsiniz."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Bağlanma birkaç dakika sürebilir..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Kuruluma devam etmek için "<b>"İleri"</b>"\'ye dokunun."\n\n"Farklı bir Kablosuz ağa bağlanmak için "<b>"Geri"</b>"\'ye dokunun."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Senkronizasyon ayarları"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Şu anda senkronizasyon sorunları yaşanıyor. Kısa süre sonra düzeltilecek."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Hesap ekle"</string>
@@ -1405,7 +1390,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Takvim"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kişiler"</string>
-    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Google Sync\'e Hoş Geldiniz!"</font>" "\n"Google Synk, kişilerinize, randevularınıza ve diğer bilgilerinize istediğiniz yerden erişebilmenize olanak veren, Google\'ın veri senkronizasyonu ürünüdür."</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Google Sync\'e Hoş Geldiniz!"</font>" "\n"Google Sync, kişilerinize, randevularınıza ve diğer bilgilerinize istediğiniz yerden erişebilmenize olanak veren, Google\'ın veri senkronizasyonu ürünüdür."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Uygulama senkronizasyon ayarları"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Veri ve senkronizasyon"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Şifreyi değiştir"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Bu öğe için senkronizasyon şu anda devre dışı bırakılmış durumdadır. Tercihinizi değiştirmek için geçici olarak arka plan verilerini ve otomatik senkronizasyonu açın."</string>
     <string name="enter_password" msgid="3268224850821675915">"Depolamanın şifresini çözmek için şifre girin"</string>
     <string name="try_again" msgid="5904121494468643129">"Maalesef, tekrar deneyin"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Hizmet meşgul, tekrar deneyin"</string>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index a2916b2..dbcaed7 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -44,9 +44,9 @@
     <item msgid="8881760709354815449">"30 секунд"</item>
     <item msgid="7589406073232279088">"1 хвилина"</item>
     <item msgid="7001195990902244174">"2 хв."</item>
-    <item msgid="7489864775127957179">"5 хв."</item>
-    <item msgid="2314124409517439288">"10 хв."</item>
-    <item msgid="6864027152847611413">"30 хв."</item>
+    <item msgid="7489864775127957179">"5 хвилин"</item>
+    <item msgid="2314124409517439288">"10 хвилин"</item>
+    <item msgid="6864027152847611413">"30 хвилин"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"відразу"</item>
@@ -55,9 +55,9 @@
     <item msgid="1822002388249545488">"30 сек."</item>
     <item msgid="8538071621211916519">"1 хв."</item>
     <item msgid="5663439580228932882">"2 хв."</item>
-    <item msgid="49888496216106852">"5 хв."</item>
-    <item msgid="9002737361305019353">"10 хв."</item>
-    <item msgid="4322676235684793329">"30 хв."</item>
+    <item msgid="49888496216106852">"5 хвилин"</item>
+    <item msgid="9002737361305019353">"10 хвилин"</item>
+    <item msgid="4322676235684793329">"30 хвилин"</item>
   </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Дуже пов."</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 07b0b28..3bae815 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Запит Bluetooth на ств. пари"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Запит на ств. пари"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Виберіть для створення пари з пристроєм <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Показати отримані файли"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Показати список файлів, отриманих через Bluetooth"</string>
     <string name="device_picker" msgid="8721012448931226323">"Інстр.виб.пристр.Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запит на дозвіл Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Програма просить дозволу на ввімкнення Bluetooth. Зробити це?"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"Вибір оператора"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Вибрати оператора мережі"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Дата та час"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Установити дату та час"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Установити дату та час"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Устан. дату, час, часовий пояс і формати"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Автомат. дата &amp; час"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Використовувати час, наданий мережею"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Устан. Моє місцезн., розблок. екрана, блок. SIM-карти, сховища обл. даних"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Устан. Моє місцезн., розбл. екрана, блок. схов. обл. даних"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Паролі"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифрування пристрою"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Зашифрувати дані в пристрої"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Зашифрувати дані в пристрої"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Потрібно встановити pin-код або пароль розблокування пристрою"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Потрібно встановити pin-код або пароль розблокування пристрою"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Зашифровано"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Можна зашифрувати облікові записи, налаштування, завантажені програми та їхні дані, медіа-файли й інші файли. Коли телефон зашифровано, шифрування можна зняти, лише виконавши відновлення заводських налаштувань, що очистить усі дані в телефоні."\n\n"Шифрування триває до години. Процес шифрування потрібно починати із зарядженою батареєю. Телефон має залишатися підключеним до джерела живлення, поки шифрування не буде завершено. Переривання процесу шифрування призведе до втрати частини чи всіх даних."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Можна зашифрувати облікові записи, налаштування, завантажені програми та їхні дані, медіа-файли й інші файли. Коли телефон зашифровано, шифрування можна зняти, лише виконавши відновлення заводських налаштувань, що очистить усі дані в телефоні."\n\n"Шифрування триває до години. Процес шифрування потрібно починати із зарядженою батареєю. Телефон має залишатися підключеним до джерела живлення, поки шифрування не буде завершено. Переривання процесу шифрування призведе до втрати частини чи всіх даних."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шифрувати пристрій"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шифрувати телефон"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Підтвердити шифрування"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Зашифрувати дані користувача? Цю операцію неможливо відмінити. Її переривання призведе до втрати даних! Шифрування триває до години."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Зашифрувати дані користувача? Цю операцію неможливо відмінити. Її переривання призведе до втрати даних! Шифрування триває до години."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифрування"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Спробуйте ще через ^1 сек."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Налашт. блокув. екрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Налашт. блокув. екрана"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Налаштув-ня пам\'яті"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Відключити носій USB, перегл. доступні носії"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Відключ. карту SD, перегл. доступ. сховище"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Мій номер телефону"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Мій номер телеф."</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Версія PRL"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"Внутрішня пам\'ять"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Носій USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Карта SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Вільне місце"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Загальний простір"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Вільно"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Усього"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Обчислення…"</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Використання програм"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Використання носіїв"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Програми"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Медіа-файли"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Відключ. спільне сховище"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Відключ. карту SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Відключити внутр. носій USB"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Це видалить усі дані з "<b>"внутрішньої пам\'яті"</b>" вашого пристрою, зокрема:"\n\n<li>"ваш обліковий запис Google"</li>\n<li>"дані й налаштування системи та програм"</li>\n<li>"завантажені програми"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Це видалить усі дані з "<b>"внутрішньої пам\'яті"</b>" вашого телефону, зокрема:"\n\n<li>"ваш обліковий запис Google"</li>\n<li>"дані й налаштування системи та програм"</li>\n<li>"завантажені програми"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Наразі ви ввійшли в такі облікові записи:"\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Фото"</li>\n<li>"Інші дані користувача"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Щоб також видалити музику, зображення й інші дані користувача, треба очистити "<b>"носій USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Щоб також видалити музику, зображення й інші дані користувача, треба стерти "<b>"карту SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Очистити носій USB"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Устан. і керуйте віртуальними приватн. мережами (VPN)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(незмін.)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(не встан.)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"Сховище облікових даних"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Викор. безпечні обл. дані"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Дозвол. програмі отр. доступ до безпечних сертифікатів й інших обл. даних"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Установити з носія USB"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Установити з карти SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Установлювати сертифікати з носія USB"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Установлювати сертифікати з карти SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Устан. пароль"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Установіть або змініть пароль сховища облікових даних"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"Очистити сховище"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Очищає весь вміст сховища облікових даних і змінює його пароль"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Установлювати чи змінювати пароль для сховища облікових даних"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Видалити облікові дані"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"Видалити весь вміст і змінити пароль"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Введіть пароль"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Введіть пароль сховища облікових даних."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ввести пароль для сховища облікових даних."</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"Установіть пароль для сховища облікових даних. Він має складатися щонайменше з 8 символів."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Поточний пароль:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Новий пароль:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Підтвердьте нов. пароль:"</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Дійсно видалити всі облікові дані та змінити пароль сховища облікових даних?"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"Увесь вміст буде видалено, а пароль буде змінено. Дійсно це зробити?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Паролі не збігаються."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Пароль має складатися принаймні з 8 символів."</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Введіть правильний пароль."</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Введіть правильний пароль. У вас залишилася ще одна спроба ввести правильний пароль до видалення сховища облікових даних."</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"Сховище облікових даних видалено."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Неправильний пароль."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Неправильний пароль. У вас залишилася ще одна спроба до очищення сховища облікових даних."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Неправильний пароль. У вас залишилося ще стільки спроб: <xliff:g id="NUMBER">%1$d</xliff:g> до очищення сховища облікових даних."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Сховище облік. даних очищено."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Сховище облік. даних увімкнено."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Аварійний сингал"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Устан. поведінку при розміщ. аварійного виклику"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"З\'єднання..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Перейдіть до наступного кроку"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"Протокол EAP не підтримується"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Під час налаштування неможливо налаштувати з\'єднання Wi-Fi через протокол EAP. Це можна зробити після налаштування в пункті \"Бездротовий зв\'язок і мережі\" в розділі \"Налаштування\"."</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Під час налаштування неможливо встановити конфігурацію з\'єднання Wi-Fi за протоколом EAP. Після налаштування це можна зробити в меню \"Налаштування\" в розділі "<b>"Бездротовий зв\'язок і мережі"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Підключення може зайняти кілька хвилин..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Торкніться опції "<b>"Далі"</b>", щоб продовжити налаштування."\n\n"Торкніться опції "<b>"Назад"</b>", щоб з\'єднатися з іншою мережею Wi-Fi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Налаштування синхронізації"</string>
     <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Наразі виникли проблеми із синхронізацією. Незабаром вона відновиться."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Додати облік. запис"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Синхронізацію для цього елемента вимкнено. Щоб змінити цей параметр, тимчасово ввімкніть фонові дані й автоматичну синхронізацію."</string>
     <string name="enter_password" msgid="3268224850821675915">"Введіть пароль, щоб розшифрувати носій"</string>
     <string name="try_again" msgid="5904121494468643129">"Спробуйте ще"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"Служба зайнята, спробуйте ще"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 1afd7e9..6dd2de4 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -266,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Đặt Vị trí của tôi, mở khoá màn hình, khoá thẻ SIM, khoá bộ nhớ thông tin xác thực"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Đặt Vị trí của tôi, mở khoá màn hình, khoá bộ nhớ thông tin xác thực"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mật khẩu"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Mã hóa thiết bị"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Mã hóa dữ liệu trên thiết bị"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Mã hóa dữ liệu trên thiết bị"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Yêu cầu bạn đặt mật khẩu hoặc số pin mở khóa thiết bị"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Yêu cầu bạn đặt mật khẩu hoặc số pin mở khóa thiết bị"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Đã mã hóa"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Bạn có thể mã hóa các tài khoản, cài đặt, ứng dụng đã tải xuống cũng như dữ liệu của chúng, phương tiện và các tệp khác của bạn. Khi mã hóa điện thoại, bạn sẽ không thể hủy mã hóa trừ khi đặt lại dữ liệu mặc định khi xuất xưởng, xóa tất cả dữ liệu trên điện thoại của bạn."\n\n"Quá trình mã hóa mất tối đa một giờ. Bạn phải bắt đầu bằng việc sạc pin và cắm điện thoại cho đến khi quá trình mã hóa hoàn tất. Nếu bạn làm gián đoạn quá trình mã hóa, bạn sẽ mất một vài hoặc tất cả dữ liệu của mình."</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Bạn có thể mã hóa các tài khoản, cài đặt, ứng dụng đã tải xuống cũng như dữ liệu của chúng, phương tiện và các tệp khác của bạn. Khi mã hóa điện thoại, bạn sẽ không thể hủy mã hóa trừ khi đặt lại dữ liệu mặc định khi xuất xưởng, xóa tất cả dữ liệu trên điện thoại của bạn."\n\n"Quá trình mã hóa mất tối đa một giờ. Bạn phải bắt đầu bằng việc sạc pin và cắm điện thoại cho đến khi quá trình mã hóa hoàn tất. Nếu bạn làm gián đoạn quá trình mã hóa, bạn sẽ mất một vài hoặc tất cả dữ liệu của mình."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Mã hóa máy tính bảng"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Mã hóa điện thoại"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Xác nhận mã hóa"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Bạn muốn mã hóa dữ liệu người dùng? Thao tác này không thể hoàn nguyên và có thể mất dữ liệu nếu bị gián đoạn! Quá trình mã hóa có thể mất tối đa một giờ."</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Bạn muốn mã hóa dữ liệu người dùng? Thao tác này không thể hoàn nguyên và có thể mất dữ liệu nếu bị gián đoạn! Quá trình mã hóa có thể mất tối đa một giờ."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Đang mã hóa"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"Hãy thử lại sau ^1 giây."</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Định cấu hình màn hình khóa"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Định cấu hình màn hình khóa"</string>
@@ -661,8 +658,8 @@
     <string name="internal_memory" msgid="9129595691484260784">"Bộ nhớ trong"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Bộ nhớ USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Thẻ SD"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Dung lượng còn trống"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Tổng dung lượng"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Sẵn có"</string>
+    <string name="memory_size" msgid="5458889090691922288">"Tổng"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Đang tính toán..."</string>
     <string name="memory_apps_usage" msgid="9079237985722858506">"Ứng dụng"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Phương tiện"</string>
@@ -994,8 +991,8 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Dừng dịch vụ hệ thống?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Bạn có chắc chắn muốn dừng dịch vụ hệ thống này không? Nếu bạn dừng thì một số tính năng của máy tính bảng của bạn có thể dừng hoạt động chính xác cho đến khi bạn tắt máy tính bảng rồi sau đó bật lại."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Bạn có chắc chắn muốn dừng dịch vụ hệ thống này không? Nếu bạn dừng thì một số tính năng của điện thoại của bạn có thể dừng hoạt động đúng cho đến khi bạn tắt điện thoại rồi sau đó bật lại."</string>
-    <string name="language_settings" msgid="5292716747264442359">"Ngôn ngữ &amp; thông tin nhập"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Ngôn ngữ &amp; thông tin nhập"</string>
+    <string name="language_settings" msgid="5292716747264442359">"Ngôn ngữ &amp; phương thức nhập"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Ngôn ngữ &amp; phương thức nhập"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Cài đặt ngôn ngữ"</string>
     <string name="keyboard_settings_category" msgid="7060453865544070642">"Cài đặt bàn phím"</string>
     <string name="phone_language" msgid="1165758957501090679">"Chọn ngôn ngữ"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3aef691..99b5d19 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"蓝牙配对请求"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配对请求"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"选择与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"显示收到的文件"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"显示通过蓝牙收到的文件列表"</string>
     <string name="device_picker" msgid="8721012448931226323">"蓝牙设备选择器"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"蓝牙权限请求"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"某一应用程序正在请求相应权限，以便打开蓝牙。要授予该权限吗？"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"运营商选择"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"选择网络运营商"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日期和时间"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"设置日期和时间"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"设置日期和时间"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"设置日期、时间、时区和格式"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"自动确定日期和时间"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"使用网络上的时间"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM 卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密码"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"设备加密"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"加密设备上的数据"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"加密设备上的数据"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"要求您设置设备解锁 PIN 码或密码"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"要求您设置设备解锁 PIN 码或密码"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体以及其他文件。加密手机后，唯一的解密方法就是恢复出厂设置，而这会清除手机上的所有数据。"\n\n"加密过程最多需要一个小时。在开始加密前，您必须先给电池充电，并在加密完成前始终连接电源。如果加密过程中出现中断会导致您的部分或全部数据丢失。"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体以及其他文件。加密手机后，唯一的解密方法就是恢复出厂设置，而这会清除手机上的所有数据。"\n\n"加密过程最多需要一个小时。在开始加密前，您必须先给电池充电，并在加密完成前始终连接电源。如果加密过程中出现中断会导致您的部分或全部数据丢失。"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"加密平板电脑"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"加密手机"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"确认加密"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"要加密用户数据吗？此操作不可逆，而且一旦中断就会导致数据丢失！加密过程最多需要一个小时。"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"要加密用户数据吗？此操作不可逆，而且一旦中断就会导致数据丢失！加密过程最多需要一个小时。"</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"正在加密"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"^1 秒后重试。"</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"配置锁定屏幕"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"配置锁定屏幕"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"存储设置"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"卸载 USB 存储设备，查看可用存储设备"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"卸载 SD 卡，查看可用存储设备"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"本机号码"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"移动目录编号 (MDN)"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"本机号码"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL 版本"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"内部存储空间"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB 存储设备"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD 卡"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"可用空间"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"总容量"</string>
+    <string name="memory_available" msgid="5052397223077021181">"可用空间"</string>
+    <string name="memory_size" msgid="5458889090691922288">"总存储空间"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"正在计算..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"应用程序使用情况"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"媒体存储空间使用情况"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"应用程序"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"媒体"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"卸载共享存储设备"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"卸载 SD 卡"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"卸载内部 USB 存储设备"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"此操作会清除您手机的"<b>"内部存储设备"</b>"中的全部数据，包括："\n\n<li>"您的 Google 帐户"</li>\n<li>"系统和应用程序数据和设置"</li>\n<li>"已下载的应用程序"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"此操作会清除您手机的"<b>"内部存储设备"</b>"中的全部数据，包括："\n\n<li>"您的 Google 帐户"</li>\n<li>"系统和应用程序数据和设置"</li>\n<li>"已下载的应用程序"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"目前，您已登录以下帐户："\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音乐"</li>\n<li>"照片"</li>\n<li>"其他的用户数据"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"要清除音乐、照片和其他用户数据，请格式化 "<b>"USB 存储设备"</b>"。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"如果也要删除音乐、图片和其他用户数据，则需要清除 "<b>"SD 卡"</b>"。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"格式化 USB 存储设备"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"设置和管理虚拟专用网"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"（未更改）"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"（未设置）"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"凭据存储"</string>
     <string name="credentials_access" msgid="4843187230913860492">"使用安全凭证"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"允许应用程序访问安全凭证和其他凭证"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"从 USB 存储设备安装"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"从 SD 卡安装"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"从 USB 存储设备安装证书"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"从 SD 卡安装证书"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"设置密码"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"设置或更改凭证存储密码"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"清除存储"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"清除所有内容的凭证存储并重置其密码"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"设置或更改凭据存储密码"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"清除凭据"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"删除所有内容并重置密码"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"输入密码"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"输入凭证存储密码。"</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"输入凭据存储密码。"</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"设置凭据存储密码（至少 8 个字符）。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"当前密码："</string>
     <string name="credentials_new_password" msgid="267487774686796938">"新密码："</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"确认新密码："</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"确定要删除所有凭证，并且重置凭证存储密码吗？"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"系统会删除所有内容并重置密码。您确定要执行此操作吗？"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"密码不匹配。"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"密码至少应包含 8 个字符。"</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"请输入正确的密码。"</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"请输入正确的密码。在系统删除该凭证存储之前，您还有一次输入正确密码的机会。"</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"该凭证存储已删除。"</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"密码不正确。"</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"密码不正确。您还可以重试一次，如果输入的密码仍不正确，系统将删除凭据存储。"</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"密码不正确。您还可以重试 <xliff:g id="NUMBER">%1$d</xliff:g> 次，如果输入的密码仍不正确，系统将删除凭据存储。"</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"凭据存储已删除。"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"凭证存储已启用。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"紧急提示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"设置进行紧急呼救时的行为"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"正在连接..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"继续下一步"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"不支持 EAP"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"您无法在设置过程中配置 EAP Wi-Fi 连接。设置完毕后，您可以在“设置”中的“无线和网络”下进行配置。"</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"不能在设置过程中配置 EAP Wi-Fi 连接。设置完成后，您可以在“设置”下的"<b>"无线和网络"</b>"中进行配置。"</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"建立连接可能需要几分钟的时间..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"触摸"<b>"下一步"</b>"可继续进行设置。"\n\n"触摸"<b>"返回"</b>"可连接到其他 Wi-Fi 网络。"</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"同步设置"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"同步操作当前遇到了一些问题，很快便可恢复。"</string>
     <string name="add_account_label" msgid="7811707265834013767">"添加帐户"</string>
@@ -1424,6 +1409,5 @@
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"当前已停止同步此条目。要更改您的偏好设置，请暂时启用背景数据和自动同步功能。"</string>
     <string name="enter_password" msgid="3268224850821675915">"输入密码，解密存储设备"</string>
     <string name="try_again" msgid="5904121494468643129">"很抱歉，请重试"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"服务正忙，请重试"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 2d9bf2f..f89bed0 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -112,10 +112,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"藍牙配對要求"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配對要求"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"選取即可與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 進行配對"</string>
-    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
-    <skip />
-    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
-    <skip />
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"顯示已接收的檔案"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"顯示已透過藍牙接收的檔案清單"</string>
     <string name="device_picker" msgid="8721012448931226323">"藍牙裝置選取器"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"藍牙權限要求"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"某個應用程式要求開啟藍牙功能，您想要允許要求嗎？"</string>
@@ -240,7 +238,7 @@
     <string name="networks" msgid="6333316876545927039">"選取電信業者"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"選取電信業者"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日期與時間"</string>
-    <!-- outdated translation 6493371065760315350 -->     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"設定日期和時間"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"設定日期和時間"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"設定日期、時間、時區與格式"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"自動判定日期和時間"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"使用網路提供的時間"</string>
@@ -268,43 +266,40 @@
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、解除鎖定畫面及鎖定認證儲存空間"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密碼"</string>
-    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
-    <skip />
+    <!-- outdated translation 2288841695457542418 -->     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"裝置加密"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"對裝置上的資料進行加密"</string>
+    <!-- outdated translation 5790930764432654508 -->     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"對裝置上的資料進行加密"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"您必須設定裝置解鎖 PIN 或密碼"</string>
+    <!-- outdated translation 1447090863225003474 -->     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"您必須設定裝置解鎖 PIN 或密碼"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"您可以針對帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案進行加密。一旦您對手機進行加密，則必須恢復原廠設定，才能解除加密狀態，但這樣會清除手機上的所有資料。"\n\n"加密過程可能需要 1 個小時的時間。進行加密前必須將電池充滿，並且在過程中讓手機維持連接電源狀態，直到加密完成為止。如果加密過程中斷，您將失去部分或所有資料。"</string>
+    <!-- outdated translation 942926028858386912 -->     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"您可以針對帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案進行加密。一旦您對手機進行加密，則必須恢復原廠設定，才能解除加密狀態，但這樣會清除手機上的所有資料。"\n\n"加密過程可能需要 1 個小時的時間。進行加密前必須將電池充滿，並且在過程中讓手機維持連接電源狀態，直到加密完成為止。如果加密過程中斷，您將失去部分或所有資料。"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"對平板電腦進行加密"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"對手機進行加密"</string>
     <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
     <skip />
     <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
-    <skip />
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"確認加密"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"確定要對使用者資料進行加密？您無法復原這項操作，也無法中斷加密過程，否則將失去資料！加密過程可能需要 1 個小時的時間。"</string>
+    <!-- outdated translation 4150888307809341579 -->     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"確定要對使用者資料進行加密？您無法復原這項操作，也無法中斷加密過程，否則將失去資料！加密過程可能需要 1 個小時的時間。"</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"加密中"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
-    <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"^1 秒內再試一次。"</string>
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
     <skip />
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"設定螢幕鎖定"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"設定螢幕鎖定"</string>
@@ -384,7 +379,7 @@
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"藍牙設定"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"管理連線、設定裝置名稱與可偵測性"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"藍牙配對要求"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"輸入 PIN 與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」進行配對 (如 0000 或 1234)。您可能需要在藍牙裝置上輸入相同的 PIN。"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"輸入 PIN 與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」進行配對 (如 0000 或 1234)。您可能也需要在藍牙裝置上輸入相同的 PIN。"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="8301499416158195044">\n"請輸入密碼金鑰與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」進行配對。"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"如要與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」配對，請確定裝置顯示以下密碼金鑰：<xliff:g id="PASSKEY">%2$s</xliff:g>。"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"想要進行配對。"</string>
@@ -418,7 +413,7 @@
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"即將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 與媒體音訊的連線。"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"即將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 與免持聽筒音訊的連線。"</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"即將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 與輸入裝置的連線。"</string>
-    <string name="bluetooth_disconnect_pan_profile" msgid="877883150720888525">"即將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的數據連線。"</string>
+    <string name="bluetooth_disconnect_pan_profile" msgid="877883150720888525">"即將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的網際網路共用連線。"</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 選項"</string>
     <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"裝置動作"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"連線"</string>
@@ -644,7 +639,7 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"儲存設定"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"卸載 USB 儲存裝置，瀏覽可用的儲存裝置"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"卸載 SD 卡，檢視可用儲存媒體。"</string>
-    <!-- outdated translation 2832987004288365675 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"我的電話號碼"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"我的電話號碼"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL 版本"</string>
@@ -663,11 +658,11 @@
     <string name="internal_memory" msgid="9129595691484260784">"內存空間"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB 儲存裝置"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD 卡"</string>
-    <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"可用空間"</string>
-    <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"空間總量"</string>
+    <string name="memory_available" msgid="5052397223077021181">"可用空間"</string>
+    <string name="memory_size" msgid="5458889090691922288">"大小總計"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"計算中..."</string>
-    <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"應用程式使用量"</string>
-    <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"媒體使用量"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"應用程式"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"媒體"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"卸載共用儲存裝置"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"卸載 SD 卡"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"卸載內部 USB 儲存裝置"</string>
@@ -737,8 +732,7 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包含："\n\n<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"這會清除您手機"<b>"內部儲存裝置"</b>"中的所有資料，包含："\n\n<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"您目前已登入下列帳戶："\n</string>
-    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
-    <skip />
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"如要一併清除音樂、圖片及其他使用者資料，則需清除 "<b>"USB 儲存裝置"</b>"。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"如要一併清除音樂、圖片及其他使用者資料，請清除 "<b>"SD 卡"</b>"。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"清除 USB 儲存裝置"</string>
@@ -1046,10 +1040,10 @@
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"永遠隱藏"</string>
     <string name="configure_input_method" msgid="7773992829158322455">"設定輸入方式"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"設定"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"可用的輸入方式"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"要用的輸入方式"</string>
     <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"使用系統設定"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> 設定"</string>
-    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"選取可用的輸入方式"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"選取要用的輸入方式"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"螢幕鍵盤設定"</string>
     <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"內建鍵盤"</string>
     <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"內建實體鍵盤設定"</string>
@@ -1112,8 +1106,8 @@
     <string name="wifi_on_time" msgid="6310209835617490616">"開啟 Wi-Fi 的時間"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"開啟 Wi-Fi 的時間"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <string name="history_details_title" msgid="3608240585315506067">"使用記錄詳細資訊"</string>
-    <string name="details_title" msgid="3792801565213935385">"使用狀況詳細資訊"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"詳細記錄"</string>
+    <string name="details_title" msgid="3792801565213935385">"詳細使用狀況"</string>
     <string name="details_subtitle" msgid="32593908269911734">"使用狀況詳細資訊"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"調整電力使用"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"已包含封裝檔案"</string>
@@ -1291,37 +1285,30 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"設定與管理虛擬私人網路 (VPN)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(未變更)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(未設定)"</string>
-    <!-- no translation found for credentials_title (4446234003860769883) -->
-    <skip />
+    <string name="credentials_title" msgid="4446234003860769883">"憑證儲存空間"</string>
     <string name="credentials_access" msgid="4843187230913860492">"使用安全認證"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"允許應用程式存取安全認證及其他認證"</string>
-    <!-- no translation found for credentials_install (1395748667227729987) -->
-    <skip />
-    <!-- no translation found for credentials_install (953914549998062317) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (3679446246093149828) -->
-    <skip />
-    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
-    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"從 USB 儲存裝置安裝"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"從 SD 卡安裝"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"從 USB 儲存裝置安裝憑證"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"從 SD 卡安裝憑證"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"設定密碼"</string>
-    <!-- outdated translation 8064067664775886428 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"設定或變更認證儲存空間密碼"</string>
-    <!-- outdated translation 3728395601619733515 -->     <string name="credentials_reset" msgid="3239382277144980418">"清除儲存空間"</string>
-    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"清除認證儲存空間的所有內容，並重設密碼"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"設定或變更憑證儲存空間的密碼"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"清除憑證"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"移除所有內容並重設密碼"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"輸入密碼"</string>
-    <!-- outdated translation 1858983840871004055 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"輸入認證儲存空間密碼。"</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"輸入憑證儲存空間的密碼。"</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"設定憑證儲存空間的密碼，密碼至少必須包含 8 個字元。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"目前的密碼："</string>
     <string name="credentials_new_password" msgid="267487774686796938">"新密碼："</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"確認新密碼："</string>
-    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"您確定要刪除所有憑證，並重設認證儲存空間密碼嗎？"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"這會移除所有內容並重設密碼，您確定要繼續進行嗎？"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"密碼不符。"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"密碼最少必須包含 8 個字元。"</string>
-    <!-- outdated translation 3713854485848035838 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"請輸入正確的密碼。"</string>
-    <!-- outdated translation 9153795503043550217 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"請輸入正確的密碼。您還有 1 次輸入密碼的機會，如果輸入錯誤，認證儲存空間將遭到清除。"</string>
-    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
-    <skip />
-    <!-- outdated translation 2375073444893796741 -->     <string name="credentials_erased" msgid="2907836028586342969">"已清除認證儲存空間內容。"</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"密碼不正確。"</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"密碼不正確。您還有 1 次輸入密碼的機會，如果輸入錯誤，憑證儲存空間將遭到清除。"</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"密碼不正確。您還有 <xliff:g id="NUMBER">%1$d</xliff:g> 次輸入密碼的機會，如果輸入錯誤，憑證儲存空間將遭到清除。"</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"憑證儲存空間已清除。"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"已啟用認證儲存空間。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急警示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"設定撥打緊急電話時的運作方式"</string>
@@ -1369,7 +1356,7 @@
     <string name="wifi_setup_save" msgid="3659235094218508211">"儲存"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"取消"</string>
     <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"正在掃描網路..."</string>
-    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"輕觸網路即可連線"</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"請輕觸要連接的網路"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"連線至現有網路"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"連線至無安全保護措施的網路"</string>
     <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"輸入網路設定"</string>
@@ -1377,11 +1364,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"連線中..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"前往下一個步驟"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"不支援 EAP"</string>
-    <!-- outdated translation 518966154814708106 -->     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"您無法在安裝期間設定 EAP Wi-Fi 連線。如要設定 EAP Wi-Fi 連線，請在安裝完成後前往 [設定] 的 [無線與網路] 之下進行設定。"</string>
-    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
-    <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
-    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"安裝期間無法設定 EAP Wi-Fi 連線，如要設定連線，請於安裝完成後，在 [設定] 的 [無線與網路] 中進行設定。"<b></b></string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"連線中，可能需要稍候幾分鐘的時間..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"輕觸 [下一步]"<b></b>" 即可繼續安裝；"\n\n"輕觸 [返回]"<b></b>" 則可連線至其他 Wi-Fi 網路。"</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"同步處理設定"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"目前同步處理發生問題。稍後會回復正常。"</string>
     <string name="add_account_label" msgid="7811707265834013767">"新增帳戶"</string>
@@ -1400,7 +1385,7 @@
     <string name="settings_backup_summary" msgid="7916877705938054035">"備份我的設定"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"現在進行同步處理"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"取消同步處理"</string>
-    <string name="sync_one_time_sync" msgid="6766593624598183090">"輕觸即可開始同步處理 <xliff:g id="LAST_SYNC_TIME">
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"輕觸此處可開始同步化 <xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"日曆"</string>
@@ -1416,14 +1401,13 @@
     <string name="really_remove_account_title" msgid="6574643117748564960">"移除帳戶"</string>
     <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"確定要移除帳戶嗎？移除帳戶後，平板電腦上的訊息、聯絡人和其他資料將一併遭到刪除。"\n"您要繼續嗎？"</string>
     <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"確定要移除帳戶嗎？移除帳戶後，手機上的訊息、聯絡人和其他資料將一併遭到刪除。"\n"您要繼續嗎？"</string>
-    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"部分應用程式需要使用這個帳戶。如要移除帳戶，您必須恢復平板電腦的原廠設定 (這麼做會刪除您的所有個人資料)。您可以前往 [設定] 應用程式中的 [隱私設定] 進行重設。"</string>
-    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"部分應用程式需要使用這個帳戶。如要移除帳戶，您必須恢復手機的原廠設定 (這麼做會刪除您的所有個人資料)。您可以前往 [設定] 應用程式中的 [隱私設定] 進行重設。"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"部分應用程式需要使用這個帳戶。如要移除此帳戶，請前往 [設定] 應用程式中的 [隱私設定]，將平手機設回原廠設定 (這麼做會刪除您全部的個人資料)。"</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"部分應用程式需要使用這個帳戶。如要移除此帳戶，請前往 [設定] 應用程式中的 [隱私設定]，將手機設回原廠設定 (這麼做會刪除您全部的個人資料)。"</string>
     <string name="provider_label" msgid="7724593781904508866">"發送訂閱"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"同步處理 <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"同步處理<xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="7185199796123573317">"無法手動同步處理"</string>
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"這個項目的同步處理功能已停用。如要變更您的偏好設定，請暫時開啟背景資料與自動同步處理功能。"</string>
-    <string name="enter_password" msgid="3268224850821675915">"輸入密碼即可為儲存空間解密"</string>
+    <string name="enter_password" msgid="3268224850821675915">"輸入密碼即可為儲存裝置解密"</string>
     <string name="try_again" msgid="5904121494468643129">"很抱歉，請再試一次"</string>
-    <!-- no translation found for service_busy (225227519012409130) -->
-    <skip />
+    <string name="service_busy" msgid="225227519012409130">"服務忙碌中，請再試一次"</string>
 </resources>
diff --git a/tests/res/values-ru/strings.xml b/tests/res/values-ru/strings.xml
index 1cd6334..a38f367 100644
--- a/tests/res/values-ru/strings.xml
+++ b/tests/res/values-ru/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="3169265480789026010">"Видимый"</string>
+    <string name="discoverable" msgid="3169265480789026010">"Видимость"</string>
     <string name="start_scan" msgid="6035699220942169744">"Начать поиск"</string>
     <string name="stop_scan" msgid="527546916633745779">"Остановить поиск"</string>
     <string name="operator_hello" msgid="292208161864910159">"Привет, оператор!"</string>