diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a47ff5a..574f6f3 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -544,7 +544,7 @@
     <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (k dispozici je chráněná síť)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpečení: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpečení <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Nic"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Žádné"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Připojit"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstranit"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Uložit"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3074f6f..4a6174f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -414,7 +414,7 @@
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"In der Regel 0000 oder 1234"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Möglicherweise müssen Sie diese PIN auch auf dem anderen Gerät eingeben."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Möglicherweise müssen Sie diesen Schlüssel auch auf dem anderen Gerät eingeben."</string>
-    <!-- syntax error in translation for bluetooth_confirm_passkey_msg (3708312912841950052) org.xmlpull.v1.XmlPullParserException: name expected (position:START_TAG <null>@1:241 in java.io.StringReader@b37c60d)  -->
+    <!-- syntax error in translation for bluetooth_confirm_passkey_msg (3708312912841950052) org.xmlpull.v1.XmlPullParserException: name expected (position:START_TAG <null>@1:241 in java.io.StringReader@771c8a71)  -->
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Von:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pairing mit diesem Gerät durchführen?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Geben Sie zum Pairing mit <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> ein und drücken Sie anschließend die Eingabetaste."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Kopplung durchführen"</string>
@@ -747,8 +747,8 @@
     <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"Wenn Sie die SD-Karte entfernen, werden einige von Ihnen verwendete Apps angehalten und sind nicht mehr verfügbar, bis Sie die SD-Karte wieder einsetzen."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="4346280469528260684">"USB-Speicher kann nicht getrennt werden. Bitte versuchen Sie es später erneut."</string>
-    <string name="dlg_error_unmount_text" product="default" msgid="3073562815631781894">"SD-Karte kann nicht entfernt werden. Bitte versuchen Sie es später erneut."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="4346280469528260684">"USB-Speicher kann nicht getrennt werden. Bitte versuchen Sie es später noch einmal."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="3073562815631781894">"SD-Karte kann nicht entfernt werden. Bitte versuchen Sie es später noch einmal."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB-Speicher wird getrennt."</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD-Karte wird getrennt."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Trennen..."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index bbc3fc2..6db7aed 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1387,7 +1387,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP समर्थित नहीं है."</string>
     <string name="wifi_setup_eap_not_supported" msgid="4521956828166347452">"आप सेट करते समय किसी EAP WiFi कनेक्‍शन को कॉन्‍िफ़गर नहीं कर सकते. सेट करने के बाद, आप उसे सेटिंग &gt; वायरलेस और नेटवर्क में कॉन्फ़िगर कर सकते हैं."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"कनेक्‍ट होने में कुछ मिनट लग सकते हैं..."</string>
-    <!-- syntax error in translation for wifi_setup_description_connected (1748172546080673171) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:191 in java.io.StringReader@43256ea2)  -->
+    <!-- syntax error in translation for wifi_setup_description_connected (1748172546080673171) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:191 in java.io.StringReader@58cf40f5)  -->
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"समन्वयन सक्षम"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"समन्वयन अक्षम"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"समन्वयन त्रुटि."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4460086..5894345 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -131,11 +131,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Parowanie..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Urządzenie Bluetooth bez nazwy"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Wyszukiwanie"</string>
-    <string name="progress_tap_to_pair" msgid="5655704645616731277">"Dotknij, aby sparować."</string>
+    <string name="progress_tap_to_pair" msgid="5655704645616731277">"Dotknij, by sparować"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Brak urządzeń Bluetooth w pobliżu"</string>
     <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="1931617700075106801">"Dotknij, aby sparować z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_notif_message" msgid="1931617700075106801">"Dotknij, by sparować z <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Pokaż odebrane pliki"</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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3709c0a..9e099a4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -131,7 +131,7 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Сопряжение..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Bluetooth-устройство без названия"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Поиск"</string>
-    <string name="progress_tap_to_pair" msgid="5655704645616731277">"Устройства"</string>
+    <string name="progress_tap_to_pair" msgid="5655704645616731277">"Выберите устройство"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Устройства Bluetooth не найдены."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Запрос сопряжения Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Запрос на сопряжение"</string>
@@ -256,7 +256,7 @@
     <string name="cancel" msgid="6859253417269739139">"Отмена"</string>
     <string name="settings_label" msgid="1626402585530130914">"Настройки"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Настройки"</string>
-    <string name="settings_shortcut" msgid="3936651951364030415">"Ярлык \"Настройки\""</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Ярлык настроек"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Режим полета"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Ещё..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Беспроводные сети"</string>
@@ -273,10 +273,10 @@
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Дата и время"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Установить дату и время"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Установка даты, времени, часового пояса и формата"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"Автонастройка даты и времени"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Дата и время сети"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Использовать время сети"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Использовать время сети"</string>
-    <string name="zone_auto" msgid="334783869352026648">"Автонастройка часового пояса"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Часовой пояс сети"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Использовать часовой пояс сети"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Использовать часовой пояс сети"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-часовой формат"</string>
@@ -430,7 +430,7 @@
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Поиск..."</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Настройки устройства"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Подключенные устройства"</string>
-    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Доступные устройства"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Список"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Подключить"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Отключить"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Выполнить сопряжение и подключить"</string>
@@ -577,7 +577,7 @@
     <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Создать группу"</string>
     <string name="wifi_p2p_menu_remove_group" msgid="4844634506540667517">"Удалить группу"</string>
     <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Дополнительно"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Поиск"</string>
+    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Список"</string>
     <string name="wifi_tether_checkbox_text" msgid="6764413986309364590">"Точка доступа Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Точка доступа <xliff:g id="NETWORK_SSID">%1$s</xliff:g> активна"</string>
     <string name="wifi_tether_failed_subtext" msgid="8178555615331315728">"Ошибка точки доступа Wi-Fi"</string>
@@ -683,7 +683,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Версия Android"</string>
     <string name="model_number" msgid="3765737700545384794">"Модель"</string>
-    <string name="baseband_version" msgid="1848990160763524801">"Версия ПО модуля связи"</string>
+    <string name="baseband_version" msgid="1848990160763524801">"Прошивка модуля связи"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Версия ядра"</string>
     <string name="build_number" msgid="3075795840572241758">"Номер сборки"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Недоступно"</string>
@@ -839,11 +839,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Для подтверждения очистки SD-карты начертите графический ключ."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Вызовы"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Голосовая почта, АОН, переадресация, параллельный вызов"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Общий USB-модем"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-модем"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Точка доступа Wi-Fi"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Общий Bluetooth-модем"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Общий модем"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Общий модем/точка доступа"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-модем"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Режим модема"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Режим модема"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-модем"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB-связь установлена, установите флажок для подключения"</string>
@@ -851,22 +851,22 @@
     <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"Невозможно подключиться при использовании USB-накопителя"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB-подключения не обнаружено"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Ошибка подключения USB"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Общий Bluetooth-модем"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-модем"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Устройство работает в режиме модема"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Режим модема на этом устройстве включен"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Включен"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Интернет-подключение планшетного ПК используется 1 устройством"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Интернет-подключение телефона используется 1 устройством"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Интернет-подключение планшетного ПК используется <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> устройствами"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Интернет-подключение телефона используется <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> устройствами"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Режим модема на этом устройстве отключен"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Режим модема на этом устройстве отключен"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Выключен"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Выключен"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Отсутствует подключение"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"Макс. число подключаемых устройств: <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Подключение к <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет прервано."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Справка"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобильная сеть"</string>
     <string name="location_title" msgid="1029961368397484576">"Мое местоположение"</string>
-    <string name="location_network_based" msgid="5569673665032992664">"Геопозиционирование Google"</string>
+    <string name="location_network_based" msgid="5569673665032992664">"По координатам сети"</string>
     <string name="location_neighborhood_level" msgid="7473531167475623654">"Использовать Wi-Fi и мобильные сети для определения местоположения"</string>
     <string name="location_neighborhood_level_wifi" msgid="1477255106707542972">"Местоположение определено по Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Спутники GPS"</string>
@@ -874,7 +874,7 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Использовать A-GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Использовать сервер для A-GPS (снимите флажок для менее интенсивного использования сети)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Использовать сервер для A-GPS (снимите флажок для улучшения работы GPS)"</string>
-    <string name="use_location_title" msgid="5206937465504979977">"Местоположение и Поиск Google"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Учитывать при поиске"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Разрешить Google использовать данные о местоположении для улучшения поиска и работы других служб"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"О планшетном ПК"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"О телефоне"</string>
@@ -1206,7 +1206,7 @@
     <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="controls_subtitle" msgid="390468421138288702">"Режим энергопотребления"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Вложенные пакеты"</string>
     <string name="power_screen" msgid="3023346080675904613">"Экран"</string>
     <string name="power_wifi" msgid="1185503168440278173">"Wi-Fi"</string>
@@ -1214,7 +1214,7 @@
     <string name="power_cell" msgid="6596471490976003056">"Связь с сетью"</string>
     <string name="power_phone" msgid="5392641106474567277">"Голосовые вызовы"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Планшетный ПК в режиме ожидания"</string>
-    <string name="power_idle" product="default" msgid="9055659695602194990">"Телефон в режиме ожидания"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Режим ожидания"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"ЦП – всего"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ЦП – активный режим"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Не отключать"</string>
@@ -1222,8 +1222,8 @@
     <string name="usage_type_wifi_running" msgid="3333082288047656594">"Время подключения Wi-Fi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Планшетный ПК"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Телефон"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Отправлено данных"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Получено данных"</string>
+    <string name="usage_type_data_send" msgid="2857401966985425427">"Отправлено"</string>
+    <string name="usage_type_data_recv" msgid="7251090882025234185">"Получено"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Аудио"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Видео"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Время работы"</string>
@@ -1303,7 +1303,7 @@
     <string name="tts_engine_settings_button" msgid="1030512042040722285">"Настройки синтеза речи"</string>
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Система по умолчанию"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Общие"</string>
-    <string name="gadget_title" msgid="5519037532720577836">"Управление питанием"</string>
+    <string name="gadget_title" msgid="5519037532720577836">"Упр. питанием"</string>
     <string name="gadget_toggle_wifi" msgid="1384149165815685611">"Обновление настроек Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Обновление настроек Bluetooth"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 7af18bd..9e2fe8b 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -136,7 +136,7 @@
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Слабкий"</item>
     <item msgid="5615082285463430971">"Задов."</item>
-    <item msgid="3565079809875324621">"Хороший"</item>
+    <item msgid="3565079809875324621">"Добрий"</item>
     <item msgid="5702329417707689835">"Відмінний"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7650ae1..ab0921b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -641,7 +641,7 @@
     <string name="brightness" msgid="2354961343555249270">"Яскравість"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Налаштуйте яскравість екрана"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Режим сну"</string>
-    <string name="screen_timeout_summary" msgid="327761329263064327">"Через <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> в режимі бездіяльності"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Після <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездіяльності"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Фоновий малюнок"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Вибрати фоновий малюнок з"</string>
     <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
@@ -770,7 +770,7 @@
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
     <string name="apn_http_proxy" msgid="1826885957243696354">"Проксі"</string>
     <string name="apn_http_port" msgid="3763259523984976226">"Порт"</string>
-    <string name="apn_user" msgid="455637547356117761">"Ім\'я кор."</string>
+    <string name="apn_user" msgid="455637547356117761">"Ім’я користувача"</string>
     <string name="apn_password" msgid="5412301994998250968">"Пароль"</string>
     <string name="apn_server" msgid="2436185314756372858">"Сервер"</string>
     <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index f59b350..af5d209 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -35,7 +35,7 @@
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Buka Izinombolo Zokudayela Okungaguquki"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Buka Izinombolo Zokudayela Isevisi"</string>
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Thola uhlu lwe-PDP"</string>
-    <string name="radioInfo_service_in" msgid="1915416319177520020">"Kwnsizakaloi"</string>
+    <string name="radioInfo_service_in" msgid="1915416319177520020">"Kwisevisi"</string>
     <string name="radioInfo_service_out" msgid="5238736759641916278">"Ayikho isevisi"</string>
     <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Amakholi aphuthumayo kuphela"</string>
     <string name="radioInfo_service_off" msgid="1434084741785525415">"Umsakazo uvaliwe"</string>
@@ -82,7 +82,7 @@
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Akwaziwa"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Iyashaja"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
-    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(I-USB)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Iyanqamula"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ayishaji"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Kugcwele"</string>
@@ -200,8 +200,8 @@
     <string name="radio_info_current_network_label" msgid="3256402602440102610">"Inethiwekhi yamanje:"</string>
     <string name="radio_info_data_successes_label" msgid="4417894113689054945">"Izimpumelelo zedatha:"</string>
     <string name="radio_info_ppp_received_label" msgid="3345184342444878849">"I-PPP itholakele:"</string>
-    <string name="radio_info_gsm_service_label" msgid="2082332114596916985">"Isiphakeli se-GSM"</string>
-    <string name="radio_info_signal_strength_label" msgid="1931937920896925766">"Amandla esignali:"</string>
+    <string name="radio_info_gsm_service_label" msgid="2082332114596916985">"Isevisi ye-GSM"</string>
+    <string name="radio_info_signal_strength_label" msgid="1931937920896925766">"Amandla esiginali:"</string>
     <string name="radio_info_call_status_label" msgid="4896238900685510883">"Umumo wekholi:"</string>
     <string name="radio_info_ppp_sent_label" msgid="5009102250704375687">"I-PPP ithunyelwe:"</string>
     <string name="radio_info_radio_resets_label" msgid="9211343458143291617">"Ukuhlela kabusha umsakazo:"</string>
@@ -211,7 +211,7 @@
     <string name="radio_info_network_type_label" msgid="3706382548257257987">"Uhlobo lwenethiwekhi:"</string>
     <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Setha uhlobo lwenethiwekhi olufisekayo:"</string>
     <string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Ntwiza Ikheli le-Ip:"</string>
-    <string name="radio_info_ping_hostname" msgid="3054888474808217853">" Ntwiza Igama lomethuleli (www.google.com):"</string>
+    <string name="radio_info_ping_hostname" msgid="3054888474808217853">"Qhweba Igama lomethuleli (www.google.com):"</string>
     <string name="radio_info_http_client_test" msgid="5733604021077701555">"Ukuhlola ikhasimende ye-HTTP"</string>
     <string name="ping_test_label" msgid="7255376471490860631">"Yenza ukuhlola kokuntwiza"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
@@ -225,7 +225,7 @@
     <string name="band_mode_failed" msgid="1495968863884716379">"Akuphumelelanga"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Kuphumelele"</string>
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Izinguquko zenzeka lapho ikhebula ye-USB ixhunyiwe kabusha"</string>
-    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Nika amandla ukugcina okuphezulu nge-USB"</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Nika amandla isitoreji esiphezulu se-USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Inani lamabhaythi:"</string>
     <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Isitoreji se-USB sehlisiwe"</string>
     <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Alikho ikhadi le-SD"</string>
@@ -259,7 +259,7 @@
     <string name="settings_shortcut" msgid="3936651951364030415">"Isinqamuleli sezilungiselelo"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Imodi yendiza"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Okungaphezulu…"</string>
-    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Okungenantambo &amp; amanethiwekhi"</string>
+    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Amanethiwekhi; nokungenantambo"</string>
     <string name="radio_controls_summary" msgid="7655909146429376368">"Phatha i-Wi-Fi, i-Bluetooth, imodi yendiza, amanethiwekhi eselula; nama-VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Ukuzulazula kwedatha"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Xhuma emasevisini edatha lapho uzulazula"</string>
@@ -433,7 +433,7 @@
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Amadivayisi atholakalayo"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Xhuma kwi-inthanethi"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Nqamula"</string>
-    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Bhangqa &amp; xhuma"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Bhangqa; uxhume"</string>
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Ungabhangqi"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Nqamula &amp; ungabhangqi"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Okukhethwayo..."</string>
@@ -602,7 +602,7 @@
     <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Khetha iringithoni yesaziso"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Imidiya"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Hlela ivolumu yomculo namavidiyo"</string>
-    <string name="alarm_volume_title" msgid="2285597478377758706">"i-Alamu"</string>
+    <string name="alarm_volume_title" msgid="2285597478377758706">"Alamu"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Izilungiselelo zomsindo zokubeka ingxenye okunamathiselwe"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Amathoni okuthinta iphedi yokudayela"</string>
     <string name="sound_effects_enable_title" msgid="1171590821131077296">"Imisindo yokuthinta"</string>
@@ -610,7 +610,7 @@
     <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Dlidliza lapho uthinta"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Ukukhansela umsindo"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"Umculo, ividiyo, imidlalo &amp; nenye imidiya"</string>
-    <string name="volume_ring_description" msgid="5936851631698298989">"Iringithoni &amp; izaziso"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Iringithoni; nezaziso"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"Izaziso"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Ama-alamu"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dokha"</string>
@@ -629,7 +629,7 @@
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Dlala umsindo lapho ufaka noma ukhipha ifoni kudokhi"</string>
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Ungadlali umsindo lapho ufaka noma ukhipha ithebhulethi kwidokhi"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Ungadlali umsindo lapho ufaka noma ukhipha ifoni ekubekeni ingxenye"</string>
-    <string name="sync_settings" msgid="9186125469300013491">"Ama-akhawunti &amp; ukuvumelanisa"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Ama-akhawunti; nokukuvumelanisa"</string>
     <string name="search_settings" msgid="1910951467596035063">"Sesha"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Phatha izilungiselelo zokusesha nomlando"</string>
     <string name="display_settings" msgid="7965901687241669598">"Bonisa"</string>
@@ -705,9 +705,9 @@
     <string name="status_network_type" msgid="3279383550222116235">"Uhlobo lwenethiwekhi yeselula"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Isimo senethiwekhi yeselula"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Isimo seseva"</string>
-    <string name="status_signal_strength" msgid="3732655254188304547">"Amandla esignali"</string>
+    <string name="status_signal_strength" msgid="3732655254188304547">"Amandla esiginali"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Iyazulazula"</string>
-    <string name="status_operator" msgid="2274875196954742087">"Uhleloxhumano"</string>
+    <string name="status_operator" msgid="2274875196954742087">"Inethiwekhi"</string>
     <string name="status_wifi_mac_address" msgid="4682277506871013855">"Ikheli le-WiFi MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Ikheli le-Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Inombolo yomkhiqizo"</string>
@@ -773,7 +773,7 @@
     <string name="apn_http_port" msgid="3763259523984976226">"Imbobo"</string>
     <string name="apn_user" msgid="455637547356117761">"Igama lomsebenzisi"</string>
     <string name="apn_password" msgid="5412301994998250968">"Iphasiwedi"</string>
-    <string name="apn_server" msgid="2436185314756372858">"Isiphakeli"</string>
+    <string name="apn_server" msgid="2436185314756372858">"Iseva"</string>
     <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
     <string name="apn_mms_proxy" msgid="5374082621073999275">"Ummeleli we-MMS"</string>
     <string name="apn_mms_port" msgid="4074188088199243040">"Imbobo ye-MMS"</string>
@@ -882,7 +882,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Buka ukwaziswa komthetho, umumo wefoni, inguqulo yesofthiwe"</string>
     <string name="legal_information" msgid="5769301644270604095">"Ukwaziswa okusemthethweni"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Abanikeli"</string>
-    <string name="copyright_title" msgid="865906688917260647">"Ilungelo lobunikazi"</string>
+    <string name="copyright_title" msgid="865906688917260647">"I-copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Ilayisensi"</string>
     <string name="terms_title" msgid="7697580845616764642">"Imigomo nemibandela"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Isifundo sesistimu"</string>
@@ -916,9 +916,9 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Chofoza Imenyu ukuthola usizo."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Dedela umunwe uma usuqedile."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Xhuma okungenani <xliff:g id="NUMBER">%d</xliff:g> amachashazi. Zama futhi:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Iphathini Iqophiwe!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Iphathini irekhodiwe!"</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Dweba iphathini futhi ukuqinisekisa:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Iphathi yakho entsha yokuvula:"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Iphethini yakho entsha yokuvula:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Qinisekisa"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Dweba kabusha"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Zama futhi"</string>
@@ -1333,7 +1333,7 @@
     <string name="emergency_tone_summary" msgid="722259232924572153">"Hlela ukuziphatha lapho ikholi oluphuthumayo lwenziwa"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Sekela ngokulondoloza usethe kabusha"</string>
     <string name="privacy_settings_title" msgid="4856282165773594890">"Sekela ngokulondoloza usethe kabusha"</string>
-    <string name="backup_section_title" msgid="7952232291452882740">"Isipele &amp; buyisela esimweni"</string>
+    <string name="backup_section_title" msgid="7952232291452882740">"Isipele; nokubuyisela esimweni"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Idatha yomuntu siqu"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sekela ngokulondoloza idatha yami"</string>
     <string name="backup_data_summary" msgid="1362648233661534995">"Yenza isipele semininingo yokulungiselela ukusebenza, kanye nzinye izilungiselelo zeziphakeli ze-Google"</string>
@@ -1431,7 +1431,7 @@
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Ukuvumelanisa kwalentwana kuvimbelwe okwamanje. Ukushintsha okukhethwayo kwakho, vula idatha yasemuva nokuvumelanisa okuzenzakalelayo."</string>
     <string name="enter_password" msgid="4131758584074246224">"Faka iphasiwedi ukuze ususe okufakwe kwindawo yokugcina"</string>
     <string name="try_again" msgid="4272075051293936921">"Zama futhi."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Insizakalo ayitholakali. Zama futhi."</string>
+    <string name="service_busy" msgid="2325014135156127705">"Isevisi ayitholakali. Zama futhi."</string>
     <string name="delete" msgid="4219243412325163003">"Susa"</string>
     <string name="misc_files" msgid="6720680815969643497">"Amafayela axubene"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"kukhethwe <xliff:g id="NUMBER">%1$d</xliff:g> kokuyi <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1511,7 +1511,7 @@
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Izinhlelo zokusebenza zisusiwe"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> itholiwe, <xliff:g id="SENT">%2$s</xliff:g> ithunyelwe"</string>
     <string name="data_usage_total_during_range" msgid="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: cishe kusetshenziswe okungu-<xliff:g id="TOTAL">%1$s</xliff:g>"</string>
-    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Ucingo oluphuthmayo"</string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Ikholi ephuthmayo"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Buyela ekholini"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Igama"</string>
     <string name="vpn_type" msgid="5435733139514388070">"Uhlobo"</string>