diff --git a/res/values-cs/custom_strings.xml b/res/values-cs/custom_strings.xml
index fd9615b..228a8ba 100644
--- a/res/values-cs/custom_strings.xml
+++ b/res/values-cs/custom_strings.xml
@@ -279,7 +279,7 @@
   <string name="recents_fullscreen_title">Celá obrazovka</string>
   <string name="weather_title">Počasí</string>
   <string name="weather_config_title">Služba počasí</string>
-  <string name="weather_config_summary">Nastavení služby systému</string>
+  <string name="weather_config_summary">Nastavení systémové služby</string>
   <string name="header_weather_title">Zobrazení počasí v záhlaví</string>
   <string name="header_weather_summary">Povolí zobrazení počasí v záhlaví na panelu upozornění</string>
   <string name="weather_icon_pack_title">Balík ikon počasí</string>
@@ -685,4 +685,6 @@
   <string name="aspect_ratio_apps_list_title">Aplikace, které můžou používat změnu velikosti</string>
   <string name="aspect_ratio_category_title">Změna velikosti starších aplikací</string>
   <string name="aspect_ratio_apps_info">Po provedených změnách je nutné aplikaci restartovat</string>
+  <string name="navigation_bar_menu_arrow_keys_title">Klávesy se šipkami při psaní</string>
+  <string name="navigation_bar_menu_arrow_keys_summary">Zobrazit tlačítka pro levý a pravý kurzor při psaní</string>
 </resources>
diff --git a/res/values-et/custom_strings.xml b/res/values-et/custom_strings.xml
index 9b487de..618ddf9 100644
--- a/res/values-et/custom_strings.xml
+++ b/res/values-et/custom_strings.xml
@@ -279,10 +279,12 @@
   <string name="recents_fullscreen_title">Täisekraan</string>
   <string name="weather_title">Ilm</string>
   <string name="weather_config_title">Ilmateenus</string>
+  <string name="weather_config_summary">Süsteemiteenuse seaded</string>
   <string name="header_weather_title">Päisevaate ilm</string>
   <string name="header_weather_summary">Luba teadetepaneeli päises ilmateate kuvamine</string>
   <string name="weather_icon_pack_title">Ilmateate ikoonipakk</string>
   <string name="weather_icon_pack_note">Märkus\u003a sa võid installida uusi ikoonipakke, otsides Play poest \"Chronus icons\"</string>
+  <string name="weather_icon_pack_info_title">Ilmateate ikoonipakki kasutatakse kiirseadetes ja lukukuval</string>
   <!-- Navigationbar settings -->
   <string name="navigationbar_title">Navigatsiooniriba</string>
   <!-- Enable Tablet Style navigation bar -->
@@ -631,6 +633,7 @@
   <string name="quick_pulldown_always">Alati</string>
   <!-- Expanded desktop -->
   <string name="expanded_desktop_title">Laiendatud töölaud</string>
+  <string name="expanded_desktop_summary">Rakendusepõhine seadistus oleku- ja navigatsiooniribale</string>
   <string name="expanded_hide_nothing">Ära peida midagi</string>
   <string name="expanded_hide_status">Peida olekuriba</string>
   <string name="expanded_hide_navigation">Peida navigatsiooniriba</string>
@@ -660,4 +663,20 @@
   <string name="hide_lockscreen_alarm_summary">Muuda äratusteksti nähtavust kellavidina all</string>
   <string name="hide_lockscreen_status_bar_title">Peida olekuriba</string>
   <string name="hide_lockscreen_status_bar_summary">Koputa olekuriba nähtavuse lülitamiseks</string>
+  <string name="hide_lockscreen_indicator_display_title">Peida alumine olekutekst</string>
+  <string name="hide_lockscreen_indicator_display_summary">Peida laadimise info ja luku avamise vihjed</string>
+  <string name="hide_lockscreen_icon_title">Peida lukukuva ikoon</string>
+  <string name="hide_lockscreen_icon_summary">Muuda lukukuva ikooni nähtavust</string>
+  <string name="lockscreen_weather_title">Näita ilmateadet</string>
+  <string name="lockscreen_weather_summary">Näita praegust ilmateadet ja temperatuuri</string>
+  <string name="lockscreen_items_aod_info_title">See nähtavuskonfiguratsioon rakendub ka ambientse ekraani puhul</string>
+  <string name="system_proxi_check_enabled_title">Läheduskontroll</string>
+  <string name="system_proxi_check_enabled_summary">Kontrolli lähedussensorit enne jõudenupu ja häälenuppude ärkamissündmuste rakendamist</string>
+  <string name="aspect_ratio_apps_enabled_title">Luba skaleerimine</string>
+  <string name="aspect_ratio_apps_enabled_summary">Luba pärandrakendustel täisekraani kasutada</string>
+  <string name="aspect_ratio_apps_list_title">Rakendused, millel lubatakse skaleerimine</string>
+  <string name="aspect_ratio_category_title">Pärandrakeduste skaleerimine</string>
+  <string name="aspect_ratio_apps_info">Rakendused tuleb peale muutusi taaskäivitada</string>
+  <string name="navigation_bar_menu_arrow_keys_title">Nooleklahvid kirjutamise ajal</string>
+  <string name="navigation_bar_menu_arrow_keys_summary">Kuva vasakut ja paremat kursorinuppu kirjutamise ajal</string>
 </resources>
diff --git a/res/values-hu/custom_strings.xml b/res/values-hu/custom_strings.xml
index b3f5f60..9dc90f8 100644
--- a/res/values-hu/custom_strings.xml
+++ b/res/values-hu/custom_strings.xml
@@ -264,8 +264,6 @@
   <string name="network_traffic_autohide_threshold">Tétlenségi küszöb</string>
   <string name="network_traffic_enable_title">Engedélyezés</string>
   <!-- captive portal - disable connectivity check -->
-  <string name="captive_portal_mode_title">Beléptető-oldal letiltása</string>
-  <string name="captive_portal_mode_summary">Kapcsolat-ellenőrzés letiltása a beléptető-oldal letiltásával</string>
   <!-- statusbar brightness -->
   <string name="status_bar_brightness_control_title">Fényerő beállítása</string>
   <string name="status_bar_brightness_control_summary">Fényerő beállítása az állapotsoron való csúsztatással</string>
diff --git a/res/values-it/custom_strings.xml b/res/values-it/custom_strings.xml
index cecc1b8..50d824d 100644
--- a/res/values-it/custom_strings.xml
+++ b/res/values-it/custom_strings.xml
@@ -609,7 +609,10 @@
   <string name="disabled_entry">Disabilitato</string>
   <string name="event_service_settings_title">Eventi</string>
   <string name="category_media_player_title">Lettore multimediale</string>
+  <string name="bt_a2dp_connect_app_list_title">Connessione Bluetooth A2DP</string>
   <string name="event_service_enabled_title">Attiva l\'evento</string>
+  <string name="event_service_running">Il servizio è in esecuzione</string>
+  <string name="event_service_stopped">Il servizio non è in esecuzione</string>
   <string name="app_chooser_left">Sinistra</string>
   <string name="app_chooser_right">Destra</string>
   <!-- Quick Pulldown-->
@@ -657,6 +660,7 @@
   <string name="hide_lockscreen_icon_summary">Modifica la visibilità dell\'icona di blocco schermo</string>
   <string name="lockscreen_weather_title">Visualizza le informazioni meteo</string>
   <string name="system_proxi_check_enabled_title">Controllo di prossimità</string>
+  <string name="aspect_ratio_apps_info">L\'applicazione dev\'essere riavviata dopo i cambiamenti</string>
   <string name="navigation_bar_menu_arrow_keys_title">Tasti direzionali durante la digitazione</string>
   <string name="navigation_bar_menu_arrow_keys_summary">Visualizza i cursori a destra e sinistra durante la digitazione</string>
 </resources>
diff --git a/res/values-nl/custom_strings.xml b/res/values-nl/custom_strings.xml
index 0149915..5636f06 100644
--- a/res/values-nl/custom_strings.xml
+++ b/res/values-nl/custom_strings.xml
@@ -279,11 +279,13 @@
   <string name="recents_fullscreen_title">Volledig scherm</string>
   <string name="weather_title">Weer</string>
   <string name="weather_config_title">Weerservice</string>
+  <string name="weather_config_summary">Systeem service instellingen</string>
   <string name="header_weather_title">Weer weergeven in header</string>
   <string name="header_weather_summary">Schakel de weergave van het weer in het notificatiepaneel in
 Schakel het tonen van het weer in het notificatiepaneel in</string>
   <string name="weather_icon_pack_title">Weer icon pack</string>
   <string name="weather_icon_pack_note">Note\u003a u kunt nieuwe icon-packs uit de play store installeren kunt door te zoeken naar \"Chronus icons\"</string>
+  <string name="weather_icon_pack_info_title">Staat pictogrampakket wordt gebruikt in snelle instellingen en vergrendelscherm</string>
   <!-- Navigationbar settings -->
   <string name="navigationbar_title">Navigatiebalk</string>
   <!-- Enable Tablet Style navigation bar -->
@@ -637,6 +639,7 @@
   <string name="quick_pulldown_always">Altijd</string>
   <!-- Expanded desktop -->
   <string name="expanded_desktop_title">Uitgebreid bureaublad</string>
+  <string name="expanded_desktop_summary">Per-app configuratie van de statusbalk en navigatiebalk</string>
   <string name="expanded_hide_nothing">Niets verbergen</string>
   <string name="expanded_hide_status">Statusbalk verbergen</string>
   <string name="expanded_hide_navigation">Navigatiebalk verbergen</string>
@@ -666,4 +669,13 @@
   <string name="hide_lockscreen_alarm_summary">Verander zichtbaarheid van alarmtekst onder klokwidget</string>
   <string name="hide_lockscreen_status_bar_title">Statusbalk verbergen</string>
   <string name="hide_lockscreen_status_bar_summary">Raak statusbalk aan om zichtbaarheid to veranderen</string>
+  <string name="hide_lockscreen_indicator_display_title">Verberg status tekst onderaan</string>
+  <string name="hide_lockscreen_indicator_display_summary">Informatie over opladen en tips over ontgrendelen verbergen</string>
+  <string name="hide_lockscreen_icon_title">Vergrendelingsschermpictogram verbergen</string>
+  <string name="hide_lockscreen_icon_summary">Wijzig de zichtbaarheid van het vergrendelschermpictogram</string>
+  <string name="lockscreen_weather_title">Toon weersomstandigheden</string>
+  <string name="lockscreen_weather_summary">Toon de huidige weersomstandigheden en temperatuur</string>
+  <string name="lockscreen_items_aod_info_title">Deze zichtbaarheidsconfiguratie is ook van toepassing op de actieve display</string>
+  <string name="system_proxi_check_enabled_title">Nabijheidscontrole</string>
+  <string name="system_proxi_check_enabled_summary">Controleer de nabijheidssensor voordat u de aan/uitknop en de volume-knop activeert</string>
 </resources>
diff --git a/res/values-pt-rPT/custom_strings.xml b/res/values-pt-rPT/custom_strings.xml
index c2bf407..8acfd30 100644
--- a/res/values-pt-rPT/custom_strings.xml
+++ b/res/values-pt-rPT/custom_strings.xml
@@ -23,6 +23,7 @@
   <string name="profiles_add">Adicionar...</string>
   <string name="profile_choose_app">Escolher aplicação</string>
   <string name="reset">Repor</string>
+  <string name="kbs">kB/s</string>
   <!-- Hardware keys -->
   <string name="button_keys_title">Botões</string>
   <string name="keys_bindings_title">Ações dos botões</string>
@@ -85,7 +86,7 @@
   <string name="button_back_kill_timeout_2000ms">2000 ms</string>
   <!-- Double tap to sleep -->
   <string name="double_tap_to_sleep_title">Toque duplo para desligar ecrã</string>
-  <string name="double_tap_to_sleep_summary">Tocar duas vezes na barra de estado para desligar o ecrã</string>
+  <string name="double_tap_to_sleep_summary">Dê um toque duplo na barra de estado para desligar o ecrã</string>
   <!-- Doze pulse (ambient display) options -->
   <string name="doze_overwrite_value_title">Substituir o valor</string>
   <string name="doze_overwrite_value_summary">Permitir substituição do valor predefinido com a configuração do utilizador</string>
@@ -196,7 +197,7 @@
   <string name="long_press_recents_action_title">Ação da pressão longa no botão Visão geral</string>
   <string name="long_press_recents_action_split">Ativar ecrã dividido</string>
   <string name="long_press_home_action_title">Toque longo no botão Página Inicial</string>
-  <string name="double_press_home_action_title">Ação de duplo toque no botão Página Inicial</string>
+  <string name="double_press_home_action_title">Ação de toque duplo no botão Página Inicial</string>
   <string name="keys_action_recents">Aplicações recentes</string>
   <string name="keys_action_assist">Assistente de lançamento</string>
   <string name="doze_brightness_level_title">Nível de brilho</string>
@@ -264,8 +265,8 @@
   <string name="network_traffic_autohide_threshold">Limiar de inatividade</string>
   <string name="network_traffic_enable_title">Ativar</string>
   <!-- captive portal - disable connectivity check -->
-  <string name="captive_portal_mode_title">Desativar o portal cativo</string>
-  <string name="captive_portal_mode_summary">Desativar a verificação de ligação ao desativar o portal cativo</string>
+  <string name="captive_portal_ignore_mode_title">Ativar o portal cativo</string>
+  <string name="captive_portal_ignore_mode_summary">Ativar a verificação de ligação ao ativar o portal cativo</string>
   <!-- statusbar brightness -->
   <string name="status_bar_brightness_control_title">Controlo de brilho</string>
   <string name="status_bar_brightness_control_summary">Ajustar o brilho deslizando através da barra de estado</string>
@@ -550,7 +551,7 @@
   <string name="system_volume_option_title">Volume do sistema</string>
   <string name="call_volume_option_title">Volume de chamadas de voz</string>
   <string name="double_tap_sleep_lockscreen_title">Toque duplo no ecrã de bloqueio para desligar o ecrã</string>
-  <string name="double_tap_sleep_lockscreen_summary">Toque duplo em qualquer parte do ecrã de bloqueio para desligar o ecrã</string>
+  <string name="double_tap_sleep_lockscreen_summary">Dê um toque duplo em qualquer parte do ecrã de bloqueio para desligar o ecrã</string>
   <string name="screen_off_animation_fade">Desvanecer simples</string>
   <string name="screen_off_animation_color">Desvanecer cor</string>
   <string name="screen_off_animation_crt">CRT</string>
@@ -688,4 +689,23 @@
   <string name="aspect_ratio_apps_info">As aplicações têm de ser reiniciadas depois das alterações</string>
   <string name="navigation_bar_menu_arrow_keys_title">Mostrar teclas de seta durante a introdução</string>
   <string name="navigation_bar_menu_arrow_keys_summary">Mostrar botões de cursor para a esquerda e direita enquanto escreve</string>
+  <string name="lockscreen_clock_style_title">Estilo do relógio no ecrã de bloqueio</string>
+  <string name="clock_style_digital">Digital</string>
+  <string name="clock_style_analog">Analógico</string>
+  <string name="clock_style_binary">Binário</string>
+  <string name="omni_clock_settings_title">Relógio analógico</string>
+  <string name="omni_clock_settings_summary">Definições de estilo e cor</string>
+  <string name="omni_clock_24h_mode_title">Modo 24h</string>
+  <string name="omni_clock_show_ticks_title">Mostrar marcas das horas</string>
+  <string name="omni_clock_show_numbers_title">Mostrar os números das horas</string>
+  <string name="omni_clock_bg_color_title">Cor de fundo</string>
+  <string name="omni_clock_border_color_title">Cor da margem</string>
+  <string name="omni_clock_hour_color_title">Cor das horas</string>
+  <string name="omni_clock_minute_color_title">Cor dos minutos</string>
+  <string name="omni_clock_text_color_title">Cor do texto</string>
+  <string name="omni_clock_accent_color_title">Cor do realce</string>
+  <string name="lockscreen_digital_clock_two_lines_title">Estilo de duas linhas</string>
+  <string name="lockscreen_digital_clock_bold_hour_title">Estilo de horas a negrito</string>
+  <string name="digital_clock_settings_title">Relógio digital</string>
+  <string name="digital_clock_settings_summary">Definições de estilo</string>
 </resources>
diff --git a/res/values-ru/custom_strings.xml b/res/values-ru/custom_strings.xml
index 09a79fd..3ac8da2 100644
--- a/res/values-ru/custom_strings.xml
+++ b/res/values-ru/custom_strings.xml
@@ -278,10 +278,13 @@
   <string name="recents_search_bar_title">Показывать строку поиска</string>
   <string name="recents_fullscreen_title">Полноэкранный режим</string>
   <string name="weather_title">Погода</string>
+  <string name="weather_config_title">Служба прогноза погоды</string>
+  <string name="weather_config_summary">Настройки системной службы</string>
   <string name="header_weather_title">Показать погоду в заголовке</string>
   <string name="header_weather_summary">Показывать изображение в заголовке панели уведомления в зависимости от времени суток</string>
   <string name="weather_icon_pack_title">Набор значков \"Погода\"</string>
   <string name="weather_icon_pack_note">Учтите\u003a вы можете установить новые наборы значков из Play Market по запросу \"Chronus icons\"</string>
+  <string name="weather_icon_pack_info_title">Набор значков погоды используется в быстрых настройках и на экране блокировки</string>
   <!-- Navigationbar settings -->
   <string name="navigationbar_title">Панель навигации</string>
   <!-- Enable Tablet Style navigation bar -->
@@ -492,6 +495,7 @@
   <string name="DESC_LIGHT_PRE_IDLE_TIMEOUT">Это количество времени, которое мы будем ждать с того момента, когда мы решаем, что мы хотели бы простаивать до тех пор, пока мы на самом деле не сделаем этого, пока ожидаем завершения работы и другой текущей деятельности</string>
   <string name="DESC_LIGHT_IDLE_TIMEOUT">Это начальное время, которое мы будем запускать в режиме ожидания в режиме обслуживания</string>
   <string name="DESC_LIGHT_IDLE_FACTOR">Масштабирующий коэффициент для применения к легкому режиму ожидания каждый раз, когда мы завершаем цикл</string>
+  <string name="DESC_LIGHT_MAX_IDLE_TIMEOUT">Это максимальное время работы в режиме ожидания</string>
   <string name="DESC_LIGHT_IDLE_MAINTENANCE_MIN_BUDGET">Это минимальное количество времени, которое мы хотим сделать доступным для режима обслуживания при легком простое</string>
   <string name="DESC_LIGHT_IDLE_MAINTENANCE_MAX_BUDGET">Это максимальное количество времени, которое мы хотим сделать доступным для режима обслуживания при легком простое</string>
   <string name="DESC_MIN_LIGHT_MAINTENANCE_TIME">Это минимальное количество времени, что мы останемся в режиме обслуживания после легкого сна</string>
@@ -616,10 +620,14 @@
   <string name="media_player_music_active_title">Не запускать событие при воспроизведении</string>
   <string name="autorun_single_app_title">Автозапуск одного приложения</string>
   <string name="autorun_single_app_summary">Не показывать диалог выбора приложения</string>
+  <string name="bt_a2dp_connect_app_list_summary">Приложения, которые будут отображаться при запуске события A2DP, например, подключение Bluetooth-гарнитуры</string>
+  <string name="headset_connect_app_list_summary">Приложения, которые будут отображаться при подключении проводных наушников</string>
   <string name="app_chooser_left">Слева</string>
   <string name="app_chooser_right">Справа</string>
   <string name="app_chooser_timeout_title">Тайм-аут диалогового окна выбора</string>
   <string name="app_chooser_position_title">Позиция диалогового окна выбора приложения</string>
+  <string name="wired_events_threshold_title">Время ожидания подключения проводных наушников</string>
+  <string name="wired_events_threshold_summary">Игнорировать события гарнитуры, когда они находятся в пределах порога</string>
   <!-- Quick Pulldown-->
   <string name="quick_pulldown_title">Быстрый доступ</string>
   <string name="quick_pulldown_summary">%1$s строки состояния при опускании вниз открывает панель быстрых настроек</string>
@@ -630,6 +638,7 @@
   <string name="quick_pulldown_always">Всегда</string>
   <!-- Expanded desktop -->
   <string name="expanded_desktop_title">Расширенный рабочий стол</string>
+  <string name="expanded_desktop_summary">Конфигурация приложения в строке состояния и панели навигации</string>
   <string name="expanded_hide_nothing">Ничего не скрывать</string>
   <string name="expanded_hide_status">Скрыть строку состояния</string>
   <string name="expanded_hide_navigation">Скрыть панель навигации</string>
@@ -659,4 +668,20 @@
   <string name="hide_lockscreen_alarm_summary">Изменение видимости текста будильника под виджетом часов</string>
   <string name="hide_lockscreen_status_bar_title">Скрыть строку состояния</string>
   <string name="hide_lockscreen_status_bar_summary">Нажмите на строку состояния, чтобы переключить видимость</string>
+  <string name="hide_lockscreen_indicator_display_title">Скрыть текст статуса внизу</string>
+  <string name="hide_lockscreen_indicator_display_summary">Скрыть информацию о зарядке и подсказки</string>
+  <string name="hide_lockscreen_icon_title">Скрыть значок экрана блокировки</string>
+  <string name="hide_lockscreen_icon_summary">Изменение видимости значка блокировки экрана</string>
+  <string name="lockscreen_weather_title">Отображать состояние погоды</string>
+  <string name="lockscreen_weather_summary">Отображать текущие погодные условия и температуру</string>
+  <string name="lockscreen_items_aod_info_title">Эта конфигурация видимости также применима к активному дисплею</string>
+  <string name="system_proxi_check_enabled_title">Проверка датчика приближения</string>
+  <string name="system_proxi_check_enabled_summary">Проверка датчика приближения перед началом работы с кнопками питания и громкости</string>
+  <string name="aspect_ratio_apps_enabled_title">Включить масштабирование</string>
+  <string name="aspect_ratio_apps_enabled_summary">Разрешить устаревшим приложениям использовать полноэкранный режим</string>
+  <string name="aspect_ratio_apps_list_title">Приложениям, которым разрешено использовать масштабирование</string>
+  <string name="aspect_ratio_category_title">Масштабирование в устаревших приложениях</string>
+  <string name="aspect_ratio_apps_info">Приложения необходимо перезапустить для применения изменений</string>
+  <string name="navigation_bar_menu_arrow_keys_title">Показывать стрелки при вводе текста</string>
+  <string name="navigation_bar_menu_arrow_keys_summary">Отображать левую и правую кнопки курсора при наборе текста</string>
 </resources>
diff --git a/res/values-sk/custom_strings.xml b/res/values-sk/custom_strings.xml
index 7d301d1..163382e 100644
--- a/res/values-sk/custom_strings.xml
+++ b/res/values-sk/custom_strings.xml
@@ -23,6 +23,7 @@
   <string name="profiles_add">Pridať...</string>
   <string name="profile_choose_app">Zvoliť aplikáciu</string>
   <string name="reset">Vynulovať</string>
+  <string name="kbs">kB/s</string>
   <!-- Hardware keys -->
   <string name="button_keys_title">Tlačidlá</string>
   <string name="keys_bindings_title">Akcie tlačidiel</string>
@@ -264,6 +265,8 @@
   <string name="network_traffic_autohide_threshold">Prah nečinnosti</string>
   <string name="network_traffic_enable_title">Zapnúť</string>
   <!-- captive portal - disable connectivity check -->
+  <string name="captive_portal_ignore_mode_title">Povoliť zadania obmedzenia</string>
+  <string name="captive_portal_ignore_mode_summary">Povoliť kontrolu pripojenia povolením položky obmedzenia</string>
   <!-- statusbar brightness -->
   <string name="status_bar_brightness_control_title">Ovládanie jasu</string>
   <string name="status_bar_brightness_control_summary">Upraviť jas posúvaním po stavovej lište</string>
@@ -278,10 +281,13 @@
   <string name="recents_search_bar_title">Zobrazovať vyhľadávaciu lištu</string>
   <string name="recents_fullscreen_title">Celá obrazovka</string>
   <string name="weather_title">Počasie</string>
+  <string name="weather_config_title">Služba počasia</string>
+  <string name="weather_config_summary">Nastavenia systémovej služby</string>
   <string name="header_weather_title">Zobrazenie počasia v záhlaví</string>
   <string name="header_weather_summary">Povoliť zobrazenie počasia v záhlaví na notifikačnom paneli</string>
   <string name="weather_icon_pack_title">Balíček ikon počasia</string>
   <string name="weather_icon_pack_note">Poznámka\u003a nové balíky ikon môžete nainštalovať z obchodu play, po vyhľadaní frázy „Chronus icons\"</string>
+  <string name="weather_icon_pack_info_title">Balíček ikon počasia je použitý v Rýchlych nastaveniach a na obrazovke uzamknutia</string>
   <!-- Navigationbar settings -->
   <string name="navigationbar_title">Navigačná lišta</string>
   <!-- Enable Tablet Style navigation bar -->
@@ -495,6 +501,7 @@
   <string name="DESC_LIGHT_PRE_IDLE_TIMEOUT">To je čas, ktorý čakáme, odkedy sme sa rozhodli prejsť do pohotovostného režimu, až kým to skutočne neuskutočníme, kým čakáme na pracovné postupy a ďalšie aktuálne aktivity na dokončenie</string>
   <string name="DESC_LIGHT_IDLE_TIMEOUT">Toto je počiatočný čas spustenia v pohotovostnom režime</string>
   <string name="DESC_LIGHT_IDLE_FACTOR">Faktor zmeny merítka, ktorý sa používa pre jednoduchý režim nečinnosti pri každom dokončení cyklu</string>
+  <string name="DESC_LIGHT_MAX_IDLE_TIMEOUT">Toto je maximálny čas spustenia v režime nečinnosti</string>
   <string name="DESC_LIGHT_IDLE_MAINTENANCE_MIN_BUDGET">Toto je minimálny čas, ktorý chcete sprístupniť pre režim údržby v režime slabej nečinnosti</string>
   <string name="DESC_LIGHT_IDLE_MAINTENANCE_MAX_BUDGET">Toto je maximálny čas, ktorý chcete sprístupniť pre režim údržby v režime slabej nečinnosti</string>
   <string name="DESC_MIN_LIGHT_MAINTENANCE_TIME">Toto je minimálny čas, po ktorý zostaneme v režime údržby po ľahkom spánku</string>
@@ -638,6 +645,7 @@
   <string name="quick_pulldown_always">Vždy</string>
   <!-- Expanded desktop -->
   <string name="expanded_desktop_title">Rozšírená plocha</string>
+  <string name="expanded_desktop_summary">Nastavenia stavového riadku a navigačného panela podľa aplikácie</string>
   <string name="expanded_hide_nothing">Nič neskrývať</string>
   <string name="expanded_hide_status">Skryť stavový riadok</string>
   <string name="expanded_hide_navigation">Skryť navigačný panel</string>
@@ -667,4 +675,39 @@
   <string name="hide_lockscreen_alarm_summary">Zmeniť viditeľnosť textu budíka pod miniaplikáciou</string>
   <string name="hide_lockscreen_status_bar_title">Skryť stavový riadok</string>
   <string name="hide_lockscreen_status_bar_summary">Dotykom na stavový riadok sa prepne viditeľnosť</string>
+  <string name="hide_lockscreen_indicator_display_title">Skryť dolný stavový text</string>
+  <string name="hide_lockscreen_indicator_display_summary">Skryť informácie o nabíjaní a tipy na odomknutie</string>
+  <string name="hide_lockscreen_icon_title">Skryť ikonu zámku obrazovky</string>
+  <string name="hide_lockscreen_icon_summary">Zmeniť viditeľnosť zámku obrazovky</string>
+  <string name="lockscreen_weather_title">Zobraziť poveternostné podmienky</string>
+  <string name="lockscreen_weather_summary">Zobraziť aktuálne počasie a teplotu</string>
+  <string name="lockscreen_items_aod_info_title">Táto konfigurácia viditeľnosti platí aj pre Ambientne zobrazenie</string>
+  <string name="system_proxi_check_enabled_title">Kontrola senzora priblíženia</string>
+  <string name="system_proxi_check_enabled_summary">Skontroluje senzor priblíženia pred manipuláciou s tlačidlom Napájanie a stlačením tlačidla Hlasitosti</string>
+  <string name="aspect_ratio_apps_enabled_title">Povoliť zmenu veľkosti</string>
+  <string name="aspect_ratio_apps_enabled_summary">Povoliť starším aplikáciám používať celú obrazovku</string>
+  <string name="aspect_ratio_apps_list_title">Aplikácie, ktoré môžu používať zmenu veľkosti</string>
+  <string name="aspect_ratio_category_title">Zmena veľkosti starších aplikácií</string>
+  <string name="aspect_ratio_apps_info">Po vykonaných zmenách je nutné aplikáciu reštartovať</string>
+  <string name="navigation_bar_menu_arrow_keys_title">Klávesy so šípkami pri písaní</string>
+  <string name="navigation_bar_menu_arrow_keys_summary">Zobraziť tlačidlá pre ľavý a pravý kurzor pri písaní</string>
+  <string name="lockscreen_clock_style_title">Štýl hodín na obrazovke uzamknutia</string>
+  <string name="clock_style_digital">Digitálne</string>
+  <string name="clock_style_analog">Analógové</string>
+  <string name="clock_style_binary">Binárne</string>
+  <string name="omni_clock_settings_title">Analógové hodiny</string>
+  <string name="omni_clock_settings_summary">Nastavenia štýlu a farieb</string>
+  <string name="omni_clock_24h_mode_title">24h režim</string>
+  <string name="omni_clock_show_ticks_title">Zobraziť značky hodín</string>
+  <string name="omni_clock_show_numbers_title">Zobraziť čísla hodín</string>
+  <string name="omni_clock_bg_color_title">Farba pozadia</string>
+  <string name="omni_clock_border_color_title">Farba ohraničenia</string>
+  <string name="omni_clock_hour_color_title">Farba hodín</string>
+  <string name="omni_clock_minute_color_title">Farba minút</string>
+  <string name="omni_clock_text_color_title">Farba textu</string>
+  <string name="omni_clock_accent_color_title">Farba zvýraznenia</string>
+  <string name="lockscreen_digital_clock_two_lines_title">Štýl dvoch riadkov</string>
+  <string name="lockscreen_digital_clock_bold_hour_title">Štýl tučných hodín</string>
+  <string name="digital_clock_settings_title">Digitálne hodiny</string>
+  <string name="digital_clock_settings_summary">Nastavenia štýlu</string>
 </resources>
diff --git a/res/values-tr/custom_strings.xml b/res/values-tr/custom_strings.xml
index 038b78d..c0600bb 100644
--- a/res/values-tr/custom_strings.xml
+++ b/res/values-tr/custom_strings.xml
@@ -23,6 +23,7 @@
   <string name="profiles_add">Ekle...</string>
   <string name="profile_choose_app">Uygulama seçin</string>
   <string name="reset">Sıfırla</string>
+  <string name="kbs">kB/s</string>
   <!-- Hardware keys -->
   <string name="button_keys_title">Tuşlar</string>
   <string name="keys_bindings_title">Tuş eylemleri</string>
@@ -91,7 +92,7 @@
   <string name="doze_overwrite_value_summary">Standart değer üzerine kullanıcı ayarını yazmaya izin ver</string>
   <string name="doze_list_mode_title">Uyku modu</string>
   <string name="doze_list_mode_summary">Uyku modu tercihleri</string>
-  <string name="doze_pulse_title">Saat ayarları</string>
+  <string name="doze_pulse_title">Sâat ayarları</string>
   <string name="doze_pulse_duration_in_title">Artarak</string>
   <string name="doze_pulse_duration_visible_title">Görünürlük süresi</string>
   <string name="doze_pulse_duration_out_title">Azalarak</string>
@@ -106,21 +107,21 @@
   <string name="doze_shake_it">Sallama idrâk edildi!</string>
   <string name="doze_shake_acc_threshold_title">Sallama eşiği</string>
   <string name="doze_shake_acc_threshold_summary">Sallamayı idrâk etmek için gerekli olan sallama kuvvetini yapılandırın</string>
-  <string name="doze_time_mode_title">Saati ve târihi göster</string>
-  <string name="doze_time_mode_summary">Bildirim yokken saati göster</string>
+  <string name="doze_time_mode_title">Sâati ve târihi göster</string>
+  <string name="doze_time_mode_summary">Bildirim yokken sâati göster</string>
   <string name="twohundred_ms">200 ms</string>
   <string name="fivehundred_ms">500 ms</string>
-  <string name="one_second">1 saniye</string>
-  <string name="one_second_default">1 saniye (standart)</string>
-  <string name="onehalf_second">1,5 saniye</string>
-  <string name="two_second">2 saniye</string>
-  <string name="twohalf_second">2.5 saniye</string>
-  <string name="three_second">3 saniye</string>
-  <string name="three_second_default">3 saniye (standart)</string>
-  <string name="threehalf_second">3.5 saniye</string>
-  <string name="four_second">4 saniye</string>
-  <string name="fourhalf_second">4.5 saniye</string>
-  <string name="five_second">5 saniye</string>
+  <string name="one_second">1 sâniye</string>
+  <string name="one_second_default">1 sâniye (standart)</string>
+  <string name="onehalf_second">1,5 sâniye</string>
+  <string name="two_second">2 sâniye</string>
+  <string name="twohalf_second">2.5 sâniye</string>
+  <string name="three_second">3 sâniye</string>
+  <string name="three_second_default">3 sâniye (standart)</string>
+  <string name="threehalf_second">3.5 sâniye</string>
+  <string name="four_second">4 sâniye</string>
+  <string name="fourhalf_second">4.5 sâniye</string>
+  <string name="five_second">5 sâniye</string>
   <string name="veryeasy_shake">Çok kolay</string>
   <string name="easy_shake">Kolay</string>
   <string name="medium_shake">Standart</string>
@@ -158,8 +159,8 @@
   <string name="statusbar_title">Durum çubuğu</string>
   <string name="battery_title">Pil görünümü</string>
   <string name="statusbar_battery_summary">Durum çubuğundaki pilin görünüm tarzını ayarlayın</string>
-  <string name="clock_title">Saat ve Târih</string>
-  <string name="statusbar_clock_summary">Durum çubuğundaki saatin görünüm tarzını ayarlayın</string>
+  <string name="clock_title">Sâat ve Târih</string>
+  <string name="statusbar_clock_summary">Durum çubuğundaki sâatin görünüm tarzını ayarlayın</string>
   <string name="battery_style_title">Tarz</string>
   <string name="statusbar_percent_inside_title">Yüzdeyi simgenin üstünde göster</string>
   <string name="statusbar_percent_inside_summary">Pil resminin üstünde pil yüzdesini göster</string>
@@ -180,7 +181,7 @@
   <string name="button_link_brightness">Ekrana bağlı</string>
   <string name="button_link_brightness_summary">Ekran parlaklığı seviyesini kullan</string>
   <string name="button_manual_brightness">Parlaklık seviyesi</string>
-  <string name="unit_sec">saniye</string>
+  <string name="unit_sec">sâniye</string>
   <string name="unit_msec">ms</string>
   <string name="button_backlight_enable_title">Etkinleştir</string>
   <string name="navigation_bar_show_title">Gezinti çubuğunu göster</string>
@@ -205,15 +206,15 @@
   <string name="lockscreen_voice_shortcut_title">Sesli yardım kısayolu</string>
   <string name="lockscreen_voice_shortcut_summary">Çevirici yerine sesli yardımcı göster</string>
   <string name="lockscreen_shortcuts_enable_title">Etkinleştir</string>
-  <string name="lockscreen_clock_display_time_title">Saati göster</string>
+  <string name="lockscreen_clock_display_time_title">Sâati göster</string>
   <string name="lockscreen_clock_display_date_title">Târihi göster</string>
   <string name="lockscreen_clock_display_alarm_title">Bir sonraki alarmı göster</string>
-  <string name="lockscreen_clock">Saat</string>
-  <string name="lockscreen_clock_font_title">Saatin yazı tipi</string>
-  <string name="lockscreen_clock_color_title">Saat ve târih rengi</string>
-  <string name="lockscreen_clock_size_title">Saat boyutu</string>
+  <string name="lockscreen_clock">Sâat</string>
+  <string name="lockscreen_clock_font_title">Sâatin yazı çeşiti</string>
+  <string name="lockscreen_clock_color_title">Sâat ve târih rengi</string>
+  <string name="lockscreen_clock_size_title">Sâat ebadı</string>
   <string name="lockscreen_clock_enable_title">Etkinleştir</string>
-  <string name="lockscreen_clock_enable_summary">Devre dışı bırakıldığında durum çubuğu saati gösterilir</string>
+  <string name="lockscreen_clock_enable_summary">Devre dışı bırakıldığında durum çubuğu sâati gösterilir</string>
   <string name="lockscreen_clock_shadow_title">Gölge</string>
   <string name="lockscreen_shortcuts_title">Husûsî uygulama kısayolları</string>
   <string name="lockscreen_shortcuts_summary">Hızlı erişim için kilit ekranında gösterilen uygulamalar. Saklamak için uzun bir müddet dokunun.</string>
@@ -253,8 +254,8 @@
   <string name="show_network_traffic_up">Giden</string>
   <string name="show_network_traffic_down">Gelen</string>
   <string name="show_network_traffic_all">Gelen ve giden</string>
-  <string name="show_network_traffic_bit">Bit / saniye</string>
-  <string name="show_network_traffic_byte">Bayt / saniye</string>
+  <string name="show_network_traffic_bit">Bits/sâniye</string>
+  <string name="show_network_traffic_byte">Bytes/sâniye</string>
   <string name="show_network_traffic_500">500 ms</string>
   <string name="show_network_traffic_1000">1000 ms</string>
   <string name="show_network_traffic_1500">1500 ms</string>
@@ -264,8 +265,8 @@
   <string name="network_traffic_autohide_threshold">Hareketsizlik eşiği</string>
   <string name="network_traffic_enable_title">Etkinleştir</string>
   <!-- captive portal - disable connectivity check -->
-  <string name="captive_portal_mode_title">Kısıtlama girişini devre dışı bırak</string>
-  <string name="captive_portal_mode_summary">Kısıtlama girişini devre dışı bırakarak bağlanabilirlik yoklamasını devre dışı bırakın</string>
+  <string name="captive_portal_ignore_mode_title">Kısıtlama girişini fa\'âl hâle getir</string>
+  <string name="captive_portal_ignore_mode_summary">Kısıtlama girişini fa\'âl hâle getirerek bağlanabilirlik yoklamasını fa\'âl hâle getirin</string>
   <!-- statusbar brightness -->
   <string name="status_bar_brightness_control_title">Parlaklık idaresi</string>
   <string name="status_bar_brightness_control_summary">Parmağınızı durum çubuğu üzerinde gezdirerek parlaklığı ayarlayın</string>
@@ -476,13 +477,13 @@
   <string name="action_save_as_profile">Profil olarak kaydet</string>
   <string name="delete_profile">Profili sil</string>
   <string name="profile_name">İsim</string>
-  <string name="string_seconds">saniye</string>
+  <string name="string_seconds">sâniye</string>
   <string name="string_default">Standart</string>
   <string name="action_filter">Süzgeç</string>
   <string name="doze_settings_applied">Uygulanan ayarlar</string>
   <string name="DESC_INACTIVE_TIMEOUT">Bu müddetten sonra cihazın tek başına bırakılıp bırakılmadığını anlamak için hareket sensörüne bakmaya başlarız. Bunu cihaz gayrî fa’âl olduktan sonra derhâl yapmıyoruz çünkü hareket sensörünü her ekran kapandığında çalıştırmak istemiyoruz</string>
   <string name="DESC_SENSING_TIMEOUT">Bu süre zarfında AnyMotion\'dan bir geri dönüş almazsak, STATE_SENSING hâlini STATE_INACTIVE olarak değiştireceğiz, ve STATE_SENSING hâlinde değilken gelen AnyMotion geri dönüşlerini görmezden geleceğiz</string>
-  <string name="DESC_LOCATING_TIMEOUT">Bu, boşta kalma moduna geçmeden evvel iyi bir yer düzeltmesi almaya çalışmak için ne kadar müddet bekleyeceğimizdir</string>
+  <string name="DESC_LOCATING_TIMEOUT">Bu, boşta kalma moduna geçmeden evvel iyi bir yer tespiti düzeltmesi almaya çalışmak için ne kadar müddet bekleyeceğimizdir</string>
   <string name="DESC_LOCATION_ACCURACY">Yerin boşta kalma moduna geçmeye müsâid olduğu kanaatine varacağımız arzu edilen âzamî hassâsiyyet (metre cinsinden). En az bu hassâsiyyette veyâ yer tayini zaman aşımına uğrayana kadar bir hassâsiyyet düzeltmesi almaya çalışacağız</string>
   <string name="DESC_MOTION_INACTIVE_TIMEOUT">Bu, hareket idrâk ettikten sonra hareket olup olmadığına tekrar bakacağımız âna kadar geçecek olan müddettir</string>
   <string name="DESC_IDLE_AFTER_INACTIVE_TIMEOUT">Bu, cihazın sâhiden boşta kalma moduna geçmesi gerektiği kanaatine varana kadar kayda değer bir hareket arayarak bekleyeceğimiz gayrî fa’âl zaman aşımı geçtikten sonraki zamandır</string>
@@ -509,7 +510,7 @@
   <string name="SHORT_INACTIVE_TIMEOUT">Gayrî fa’âl zaman aşımı</string>
   <string name="SHORT_SENSING_TIMEOUT">Sensör zaman aşımı</string>
   <string name="SHORT_LOCATING_TIMEOUT">Yer tayini zaman aşımı</string>
-  <string name="SHORT_LOCATION_ACCURACY">Yer hassâsiyyeti</string>
+  <string name="SHORT_LOCATION_ACCURACY">Yer tespit etme hassâsiyyeti</string>
   <string name="SHORT_MOTION_INACTIVE_TIMEOUT">Hareketsizlik zaman aşımı</string>
   <string name="SHORT_IDLE_AFTER_INACTIVE_TIMEOUT">Gayrî fa\'âl zaman aşımından sonra boşta kal</string>
   <string name="SHORT_IDLE_PENDING_TIMEOUT">Muallak boşta kalma zaman aşımı</string>
@@ -573,28 +574,28 @@
   <string name="battery_percent_always">Dâîmâ</string>
   <string name="battery_percent_expanded">Sadece genişletildiğinde</string>
   <string name="battery_percent_title">Yüzdeyi göster</string>
-  <string name="status_bar_clock">Saat ve Târih</string>
+  <string name="status_bar_clock">Sâat ve Târih</string>
   <string name="clock_title_enable">Hizalama</string>
   <string name="clock_enabled">Fa\'âl</string>
   <string name="clock_disabled">Devre dışı</string>
   <string name="status_bar_clock_style_reset">Rengi sıfırla</string>
-  <string name="status_bar_show_clock_title">Saati ve târihi göster</string>
+  <string name="status_bar_show_clock_title">Sâati ve târihi göster</string>
   <string name="status_bar_am_pm_title">ÖÖ veyâ ÖS</string>
-  <string name="status_bar_am_pm_info">24 saat görünümü fa\'âl</string>
+  <string name="status_bar_am_pm_info">24\'lük sâat şekli fa\'âl</string>
   <string name="enable_clock_weekday">Haftanın günü</string>
-  <string name="enable_clock_weekday_summary">Saatin yanında kısaltılmış şekilde haftanın günü</string>
-  <string name="right_clock">Saat sağda</string>
-  <string name="left_clock">Saat solda</string>
+  <string name="enable_clock_weekday_summary">Sâatin yanında kısaltılmış şekilde haftanın günü</string>
+  <string name="right_clock">Sâat sağda</string>
+  <string name="left_clock">Sâat solda</string>
   <string name="dont_show">Gösterme</string>
   <string name="clock_date_display">Târih</string>
-  <string name="clock_date_display_summary">Saatin yanında husûsî târih göster</string>
+  <string name="clock_date_display_summary">Sâatin yanında husûsî târih göster</string>
   <string name="clock_date_style">Târih tarzı</string>
   <string name="clock_date_position">Târih yeri</string>
   <string name="clock_date_format">Târih şekli</string>
   <string name="clock_date_string_edittext_title">Meselâ AA/gg/yy gibi târih şeklinde olmalı</string>
   <string name="clock_date_string_edittext_summary">Metin girin</string>
-  <string name="clock_date_right">Saatin sağında</string>
-  <string name="clock_date_left">Saatin solunda</string>
+  <string name="clock_date_right">Sâatin sağında</string>
+  <string name="clock_date_left">Sâatin solunda</string>
   <string name="am_pm_clock_normal">Tabîî yazı çeşiti boyutu</string>
   <string name="am_pm_clock_small">Küçük yazı çeşiti boyutu</string>
   <string name="am_pm_clock_none">Gösterme</string>
@@ -605,7 +606,7 @@
   <string name="clock_date_style_lowercase">Küçük harf</string>
   <string name="clock_date_style_uppercase">Büyük harf</string>
   <string name="clock_date_format_custom">Husûsî java şekli</string>
-  <string name="status_bar_clock_seconds_title">Saniyeleri göster</string>
+  <string name="status_bar_clock_seconds_title">Sâniyeleri göster</string>
   <!-- fingerprint authentication vibration -->
   <string name="fprint_sucess_vib_title">Parmak izi teyit etme titreşimi</string>
   <string name="fprint_sucess_vib_summary">Parmak izi başarılı bir şekilde teyit edildiğinde titre</string>
@@ -665,12 +666,12 @@
   <!-- Hide lockscreen status bar, clock, date, alarm -->
   <string name="lockscreen_item_title">Kilit ekranı unsurları</string>
   <string name="lockscreen_item_summary">Kilit ekranı unsurlarının görünürlüğünü ayarlayın</string>
-  <string name="hide_lockscreen_clock_title">Saat widget\'ını sakla</string>
-  <string name="hide_lockscreen_clock_summary">Saat widget\'ının görünürlüğünü değiştirin</string>
+  <string name="hide_lockscreen_clock_title">Sâat widget\'ını sakla</string>
+  <string name="hide_lockscreen_clock_summary">Sâat widget\'ının görünürlüğünü değiştirin</string>
   <string name="hide_lockscreen_date_title">Târih widget\'ını sakla</string>
-  <string name="hide_lockscreen_date_summary">Saat widget\'ının altındaki târihin görünürlüğünü değiştirin</string>
+  <string name="hide_lockscreen_date_summary">Sâat widget\'ının altındaki târihin görünürlüğünü değiştirin</string>
   <string name="hide_lockscreen_alarm_title">Alarm metnini sakla</string>
-  <string name="hide_lockscreen_alarm_summary">Saat widget\'ının altındaki alarm metninin görünürlüğünü değiştirin</string>
+  <string name="hide_lockscreen_alarm_summary">Sâat widget\'ının altındaki alarm metninin görünürlüğünü değiştirin</string>
   <string name="hide_lockscreen_status_bar_title">Durum çubuğunu sakla</string>
   <string name="hide_lockscreen_status_bar_summary">Görünürlüğü değiştirmek için durum çubuğuna dokunun</string>
   <string name="hide_lockscreen_indicator_display_title">Alttaki durum metnini sakla</string>
@@ -689,4 +690,23 @@
   <string name="aspect_ratio_apps_info">Değişikliklerden sonra uygulamaların tekrar başlatılması gerekir</string>
   <string name="navigation_bar_menu_arrow_keys_title">Yazarken ok tuşlarını göster</string>
   <string name="navigation_bar_menu_arrow_keys_summary">Yazarken sağda ve solda işaretçi düğmelerini göster</string>
+  <string name="lockscreen_clock_style_title">Kilit ekranındaki saâtin tarzı</string>
+  <string name="clock_style_digital">Dijital</string>
+  <string name="clock_style_analog">Analog</string>
+  <string name="clock_style_binary">Çift</string>
+  <string name="omni_clock_settings_title">Analog saât</string>
+  <string name="omni_clock_settings_summary">Tarz ve renk ayarları</string>
+  <string name="omni_clock_24h_mode_title">24 saât modu</string>
+  <string name="omni_clock_show_ticks_title">Saât işâretlerini göster</string>
+  <string name="omni_clock_show_numbers_title">Saât rakamlarını göster</string>
+  <string name="omni_clock_bg_color_title">Arka plan rengi</string>
+  <string name="omni_clock_border_color_title">Kenarlık rengi</string>
+  <string name="omni_clock_hour_color_title">Saât rengi</string>
+  <string name="omni_clock_minute_color_title">Dakîka rengi</string>
+  <string name="omni_clock_text_color_title">Metin rengi</string>
+  <string name="omni_clock_accent_color_title">Ara renk</string>
+  <string name="lockscreen_digital_clock_two_lines_title">İki satır tarzı</string>
+  <string name="lockscreen_digital_clock_bold_hour_title">Kalın saât tarzı</string>
+  <string name="digital_clock_settings_title">Dijital sâat</string>
+  <string name="digital_clock_settings_summary">Tarz ayarları</string>
 </resources>
diff --git a/res/values-zh-rCN/custom_strings.xml b/res/values-zh-rCN/custom_strings.xml
index 2d21707..2ab2396 100644
--- a/res/values-zh-rCN/custom_strings.xml
+++ b/res/values-zh-rCN/custom_strings.xml
@@ -23,6 +23,7 @@
   <string name="profiles_add">添加...</string>
   <string name="profile_choose_app">选择应用</string>
   <string name="reset">重置​​​</string>
+  <string name="kbs">kB/s</string>
   <!-- Hardware keys -->
   <string name="button_keys_title">按键</string>
   <string name="keys_bindings_title">按键行为</string>
@@ -67,7 +68,7 @@
   <string name="volume_button_music_control_title">音乐控制</string>
   <string name="volume_button_music_control_summary">熄屏模式下长按音量键切换歌曲</string>
   <string name="keys_action_sleep">进入睡眠</string>
-  <string name="keys_action_omniswitch">OmniSwitch 历史</string>
+  <string name="keys_action_omniswitch">OmniSwitch 最近任务</string>
   <string name="button_home_wake_title">音量键唤醒</string>
   <string name="button_home_wake_summary">按下主页键唤醒设备</string>
   <string name="button_home_answers_call_title">按钮接听电话</string>
@@ -253,8 +254,8 @@
   <string name="show_network_traffic_up">上传</string>
   <string name="show_network_traffic_down">下载</string>
   <string name="show_network_traffic_all">上传和下载</string>
-  <string name="show_network_traffic_bit">Bits/秒</string>
-  <string name="show_network_traffic_byte">Bytes/秒</string>
+  <string name="show_network_traffic_bit">每秒比特数</string>
+  <string name="show_network_traffic_byte">每秒字节数</string>
   <string name="show_network_traffic_500">500 毫秒</string>
   <string name="show_network_traffic_1000">1000 毫秒</string>
   <string name="show_network_traffic_1500">1500 毫秒</string>
@@ -264,8 +265,8 @@
   <string name="network_traffic_autohide_threshold">不活动状态阈值</string>
   <string name="network_traffic_enable_title">启用</string>
   <!-- captive portal - disable connectivity check -->
-  <string name="captive_portal_mode_title">禁用 captive portal</string>
-  <string name="captive_portal_mode_summary">通过禁用 captive portal 来取消网络连接检查</string>
+  <string name="captive_portal_ignore_mode_title">启用 captive portal</string>
+  <string name="captive_portal_ignore_mode_summary">通过启用 captive portal 启用连接检查</string>
   <!-- statusbar brightness -->
   <string name="status_bar_brightness_control_title">亮度调节</string>
   <string name="status_bar_brightness_control_summary">在状态栏上左右滑动以调整亮度</string>
@@ -442,8 +443,8 @@
   <string name="wakelocks_title">唤醒锁</string>
   <string name="wakelocks_summary">显示唤醒锁统计信息</string>
   <string name="system_category">系统</string>
-  <string name="custom_wall_browse_title">Omni壁纸</string>
-  <string name="custom_wall_browse_summary">浏览和设置Omni壁纸</string>
+  <string name="custom_wall_browse_title">Omni 壁纸</string>
+  <string name="custom_wall_browse_summary">浏览并设置 Omni 壁纸</string>
   <string name="show_cpu_title">显示 CPU 信息</string>
   <string name="show_cpu_summary">在屏幕上显示当前 CPU 信息</string>
   <string name="headset_plugged_notification_title">耳机通知</string>
@@ -463,7 +464,7 @@
   <string name="volume_button_force_media_title">使用媒体音量</string>
   <string name="volume_button_force_media_summary">默认情况下会更改媒体音量</string>
   <string name="status_bar_logo_title">状态栏图标</string>
-  <string name="status_bar_logo_summary">一个小的swag</string>
+  <string name="status_bar_logo_summary">一个小的 swag</string>
   <!-- Doze settings editor -->
   <string name="doze_settings_title">休眠设置</string>
   <string name="doze_settings_summary">更改休眠设置</string>
@@ -686,4 +687,23 @@
   <string name="aspect_ratio_apps_info">更改后需要重新启动应用程序</string>
   <string name="navigation_bar_menu_arrow_keys_title">键入光标</string>
   <string name="navigation_bar_menu_arrow_keys_summary">键入时显示左、右光标</string>
+  <string name="lockscreen_clock_style_title">锁定屏幕时钟风格</string>
+  <string name="clock_style_digital">数字</string>
+  <string name="clock_style_analog">指针</string>
+  <string name="clock_style_binary">二进制</string>
+  <string name="omni_clock_settings_title">指针时钟</string>
+  <string name="omni_clock_settings_summary">样式和颜色设置</string>
+  <string name="omni_clock_24h_mode_title">24 小时模式</string>
+  <string name="omni_clock_show_ticks_title">显示小时标记</string>
+  <string name="omni_clock_show_numbers_title">显示小时数</string>
+  <string name="omni_clock_bg_color_title">背景颜色</string>
+  <string name="omni_clock_border_color_title">边框颜色</string>
+  <string name="omni_clock_hour_color_title">小时颜色</string>
+  <string name="omni_clock_minute_color_title">分钟颜色</string>
+  <string name="omni_clock_text_color_title">文本颜色</string>
+  <string name="omni_clock_accent_color_title">强调色</string>
+  <string name="lockscreen_digital_clock_two_lines_title">双线样式</string>
+  <string name="lockscreen_digital_clock_bold_hour_title">粗体小时样式</string>
+  <string name="digital_clock_settings_title">数字时钟</string>
+  <string name="digital_clock_settings_summary">样式设置</string>
 </resources>