diff --git a/res/values-de/custom_strings.xml b/res/values-de/custom_strings.xml
index ebbc3ab..7e95c96 100644
--- a/res/values-de/custom_strings.xml
+++ b/res/values-de/custom_strings.xml
@@ -82,6 +82,7 @@
   <string name="button_back_kill_timeout_500ms">500 ms</string>
   <string name="button_back_kill_timeout_1000ms">1000 ms</string>
   <string name="button_back_kill_timeout_1500ms">1500 ms</string>
+  <string name="button_back_kill_timeout_2000ms">2000 ms</string>
   <!-- Double tap to sleep -->
   <string name="double_tap_to_sleep_title">Doppelt Tippen für Schlafmodus</string>
   <string name="double_tap_to_sleep_summary">Tippe die Statusleiste zweimal an, um das Gerät in den Ruhemodus zu versetzen</string>
@@ -157,6 +158,7 @@
   <string name="statusbar_title">Statusleiste</string>
   <string name="battery_title">Batterie-Anzeige</string>
   <string name="statusbar_battery_summary">Darstellung der Batterieanzeige festlegen</string>
+  <string name="clock_title">Uhrzeit und Datum</string>
   <string name="battery_style_title">Aussehen</string>
   <string name="statusbar_percent_inside_title">Prozent anzeigen</string>
   <string name="statusbar_charging_image_title">Ladeanzeige</string>
@@ -231,6 +233,7 @@
   <string name="style_disabled_summary">Benutzerdefiniertes Header-Bild ist AUS</string>
   <string name="header_provider_disabled">Deaktiviert</string>
   <string name="custom_header_title">Benutzerdefiniertes Header-Bild</string>
+  <string name="file_header_provider_title">Einzelnes Bild</string>
   <!-- Network traffic -->
   <string name="network_traffic_title">Netzwerkverkehr</string>
   <string name="network_traffic_summary">Statusleisten Netzwerkverkehrsanzeige</string>
@@ -311,6 +314,7 @@
   <!--<string name="screenshot_crop_behavior_title"></string>
     <string name="screenshot_crop_behavior_summary"></string>-->
   <string name="lockscreen_qs_disabled_title">Schnelleinstellungen bei gesperrtem Bildschirm deaktivieren</string>
+  <string name="lockscreen_qs_disabled_summary">Zugriff auf die Schnelleinstellungen bei gesichertem Sperrbildschirm deaktivieren</string>
   <string name="lockscreen_power_menu_disabled_title">Power-Menü im Sperrbildschirm deaktivieren</string>
   <string name="lockscreen_power_menu_disabled_summary">Power-Menü im sicheren Sperrbildschirm deaktivieren</string>
   <string name="status_bar_quick_qs_pulldown_title">Schnelles Öffnen</string>
@@ -538,6 +542,32 @@
   <string name="volume_steps_5">5 Schritte</string>
   <string name="system_volume_option_title">System-Lautstärke</string>
   <string name="call_volume_option_title">Gesprächslautstärke</string>
+  <string name="battery_style_text">Nur Text</string>
+  <string name="battery_style_default">Standard</string>
+  <string name="battery_percent_none">Niemals</string>
+  <string name="battery_percent_always">Immer</string>
   <string name="battery_percent_title">Prozent anzeigen</string>
+  <string name="clock_enabled">Aktiviert</string>
+  <string name="clock_disabled">Deaktiviert</string>
+  <string name="status_bar_clock_style_reset">Farbe zurücksetzen</string>
+  <string name="status_bar_am_pm_title">AM/PM</string>
+  <string name="status_bar_am_pm_info">24-Stunden-Anzeige ist aktiviert</string>
+  <string name="enable_clock_weekday">Wochentag</string>
+  <string name="right_clock">Uhr rechts</string>
+  <string name="left_clock">Uhr links</string>
+  <string name="dont_show">Nicht anzeigen</string>
+  <string name="clock_date_display">Datum</string>
+  <string name="clock_date_format">Datumsformat</string>
+  <string name="am_pm_clock_normal">Normale Schriftgröße</string>
+  <string name="am_pm_clock_small">Kleine Schriftgröße</string>
+  <string name="am_pm_clock_none">Nicht anzeigen</string>
+  <string name="clock_date_display_none">Nicht anzeigen</string>
+  <string name="clock_date_display_small">Kleine Schriftgröße</string>
+  <string name="clock_date_display_normal">Normale Schriftgröße</string>
+  <string name="clock_date_style_normal">Normal</string>
+  <string name="clock_date_style_lowercase">Kleinbuchstaben</string>
+  <string name="clock_date_style_uppercase">Großbuchstaben</string>
+  <string name="status_bar_clock_seconds_title">Sekunden anzeigen</string>
   <!-- fingerprint authentication vibration -->
+  <string name="disabled_entry">Deaktiviert</string>
 </resources>
diff --git a/res/values-es/custom_strings.xml b/res/values-es/custom_strings.xml
index 19c1cbc..7aca05a 100644
--- a/res/values-es/custom_strings.xml
+++ b/res/values-es/custom_strings.xml
@@ -491,7 +491,9 @@
   <string name="SHORT_MIN_TIME_TO_ALARM">Tiempo mínimo para alarmar</string>
   <string name="logcat_app_title">MatLog</string>
   <string name="show_dashboard_columns_title">Diseño de dos columnas</string>
+  <string name="show_dashboard_columns_summary">En la página principal de configuración</string>
   <string name="hide_dashboard_summary_title">Ocultar Resumen</string>
+  <string name="hide_dashboard_summary_summary">En la página principal de configuración</string>
   <string name="systemui_theme_style_auto">Basado en el fondo de pantalla</string>
   <string name="systemui_theme_style_light">Estilo ligero</string>
   <string name="systemui_theme_style_dark">Estilo oscuro</string>
@@ -505,6 +507,7 @@
   <string name="call_volume_option_title">Volumen de la voz en llamadas</string>
   <string name="double_tap_sleep_lockscreen_title">Doble toque en la pantalla de bloqueo para bloquear</string>
   <string name="double_tap_sleep_lockscreen_summary">Doble toque en cualquier lugar de la pantalla de bloqueo para bloquear equipo</string>
+  <string name="screen_off_animation_crt">CRT</string>
   <string name="screen_off_animation_scale">Escalar</string>
   <string name="screen_off_animation_title">Animación al apagar la pantalla</string>
   <string name="omni_theme_select_title">Temas de Omni</string>
diff --git a/res/values-et/custom_strings.xml b/res/values-et/custom_strings.xml
index 94a032d..741533b 100644
--- a/res/values-et/custom_strings.xml
+++ b/res/values-et/custom_strings.xml
@@ -159,8 +159,10 @@
   <string name="battery_title">Aku kuva</string>
   <string name="statusbar_battery_summary">Määra olekuriba aku kuva stiil</string>
   <string name="clock_title">Kell ja kuupäev</string>
+  <string name="statusbar_clock_summary">Määra olekuriba kella kuva stiil</string>
   <string name="battery_style_title">Stiil</string>
   <string name="statusbar_percent_inside_title">Protsentide ülekate</string>
+  <string name="statusbar_percent_inside_summary">Kuva protsente aku pildi peal</string>
   <string name="statusbar_charging_image_title">Laadija indikaator</string>
   <string name="statusbar_category_charging_title">Laadimine</string>
   <string name="statusbar_charging_image_summary">Kuva laadimisel välguindikaatorit. Peidab protsentide ülekatte</string>
@@ -170,6 +172,7 @@
   <string name="button_backlight_title">Nupu taustavalgus</string>
   <string name="button_backlight_summary">Seadista lubamist ja heledust</string>
   <string name="button_backlight_on_touch_only_title">Nupu vajutusel</string>
+  <string name="button_backlight_on_touch_only_summary">Luba ajalõpuga taustavalgustus ainult nupuvajutusel</string>
   <string name="button_timeout_title">Taustavalguse ajalõpp</string>
   <string name="button_timeout_summary">Keelatud väärtuse 0 korral</string>
   <string name="button_link_brightness">Lingi ekraanile</string>
@@ -224,6 +227,7 @@
   <string name="lockscreen_category_title">Lukukuva</string>
   <string name="notification_title">Teatepaneel</string>
   <string name="status_bar_custom_header_title">Luba</string>
+  <string name="daylight_header_pack_title">Päisepiltide kogu</string>
   <string name="status_bar_custom_header_shadow_title">Päisepildi vari</string>
   <string name="status_bar_custom_header_shadow_summary">Parema nähtavuse jaoks heledatel piltidel</string>
   <string name="unit_percent">\u0025</string>
@@ -231,10 +235,13 @@
   <string name="daylight_header_provider_title">Pildikollektsioon</string>
   <string name="custom_header_provider_title">Päise pakkuja</string>
   <string name="custom_header_pick_title">Vali päisepilt</string>
+  <string name="custom_header_pick_summary">Vali kohalik või võrgusolev pilt</string>
   <string name="style_enabled_summary">Kohandatud päisepilt VÄLJAS</string>
   <string name="style_disabled_summary">Kohandatud päisepilt SEES</string>
   <string name="header_provider_disabled">Keelatud</string>
   <string name="custom_header_title">Kohandatud päisepilt</string>
+  <string name="file_header_select_title">Vali kohalik pilt</string>
+  <string name="file_header_select_summary">Vali sisemälust pilt</string>
   <string name="file_header_provider_title">Üksik pilt</string>
   <!-- Network traffic -->
   <string name="network_traffic_title">Võrguliiklus</string>
@@ -316,6 +323,7 @@
   <!--<string name="screenshot_crop_behavior_title"></string>
     <string name="screenshot_crop_behavior_summary"></string>-->
   <string name="lockscreen_qs_disabled_title">Keela lukustatud olekus kiirseaded</string>
+  <string name="lockscreen_qs_disabled_summary">Keela kiirseadete laiendamine turvalistel lukukuvadel</string>
   <string name="lockscreen_power_menu_disabled_title">Keela lukus olles toitemenüü</string>
   <string name="lockscreen_power_menu_disabled_summary">Keela toitemenüü turvalisel lukukuval</string>
   <string name="status_bar_quick_qs_pulldown_title">Kiire allatõmme</string>
@@ -424,6 +432,8 @@
   <string name="copy_as_text">Kopeeri tekstina</string>
   <string name="google_it">Googelda seda</string>
   <string name="app_details">Rakenduse üksikasjad</string>
+  <string name="no_stat_because_reset_state">Vajuta nulli, et alustada aja lugemist andmete olekus</string>
+  <string name="no_stat_because_reset_wakelock">Vajuta nulli, et alustada ärkamisluku andmete kogumist</string>
   <string name="no_states_file_found">Olekute faili ei leitud. Kas oled kindel, et su telefon
         ühildub?\n\nKui sa kasutad kohandatud ROMi või tuuma, proovi
         kontakteeruda selle arendajaga, teatamaks, et olekute fail
@@ -503,6 +513,8 @@
   <string name="volume_steps_5">5 astet</string>
   <string name="system_volume_option_title">Süsteemi helitugevus</string>
   <string name="call_volume_option_title">Kõne helitugevus</string>
+  <string name="double_tap_sleep_lockscreen_title">Topeltkoputa lukukuva unerežiimiks</string>
+  <string name="double_tap_sleep_lockscreen_summary">Topeltkoputa lukukuval mistahes kohas, et viia seade unerežiimi</string>
   <string name="screen_off_animation_fade">Lihtne hajumine</string>
   <string name="screen_off_animation_color">Värvi hajumine</string>
   <string name="screen_off_animation_crt">Kineskoop</string>
@@ -522,6 +534,7 @@
   <string name="statusbar_battery_dotted_line_summary">Kasuta katkendjoone efekti teatud stiilide puhul</string>
   <string name="battery_percent_none">Mitte kunagi</string>
   <string name="battery_percent_always">Alati</string>
+  <string name="battery_percent_expanded">Ainult laiendatult</string>
   <string name="battery_percent_title">Kuva protsente</string>
   <string name="status_bar_clock">Kell ja kuupäev</string>
   <string name="clock_title_enable">Paigutus</string>
@@ -532,10 +545,12 @@
   <string name="status_bar_am_pm_title">AM/PM</string>
   <string name="status_bar_am_pm_info">24-tunni kell on lubatud</string>
   <string name="enable_clock_weekday">Nädalapäev</string>
+  <string name="enable_clock_weekday_summary">Lühendatud nädalapäev enne kella</string>
   <string name="right_clock">Kell paremal</string>
   <string name="left_clock">Kell vasakul</string>
   <string name="dont_show">Ära näita</string>
   <string name="clock_date_display">Kuupäev</string>
+  <string name="clock_date_display_summary">Kuva kohandatud kuupäeva enne kella</string>
   <string name="clock_date_style">Kuupäeva laad</string>
   <string name="clock_date_position">Kuupäeva asukoht</string>
   <string name="clock_date_format">Kuupäeva vorming</string>
@@ -555,6 +570,10 @@
   <string name="clock_date_format_custom">Kohandatud Java vorming</string>
   <string name="status_bar_clock_seconds_title">Kuva sekundeid</string>
   <!-- fingerprint authentication vibration -->
+  <string name="fprint_sucess_vib_title">Sõrmejälje autentimise vibratsioon</string>
+  <string name="fprint_sucess_vib_summary">Vibreeri edukal sõrmejälje autentimisel</string>
   <string name="choose_app">Vali rakendus</string>
+  <string name="not_ready_summary">Lahendan...</string>
+  <string name="resolve_failed_summary">Rakenduse lahendamine ebaõnnestus</string>
   <string name="disabled_entry">Keelatud</string>
 </resources>
diff --git a/res/values-fi/custom_strings.xml b/res/values-fi/custom_strings.xml
index 03629e9..4721b06 100644
--- a/res/values-fi/custom_strings.xml
+++ b/res/values-fi/custom_strings.xml
@@ -107,6 +107,7 @@
   <string name="led_color_blue">Sininen</string>
   <string name="statusbar_title">Tilapalkki</string>
   <string name="clock_title">Kello ja päivämäärä</string>
+  <string name="statusbar_clock_summary">Aseta tilapalkin kellon tyyli</string>
   <string name="battery_style_title">Tyyli</string>
   <string name="statusbar_category_charging_title">Ladataan</string>
   <string name="statusbar_battery_charging_color_title">Väri</string>
@@ -143,6 +144,8 @@
   <string name="lockscreen_clock_color_title">Ajan ja päivämäärän väri</string>
   <string name="lockscreen_clock_size_title">Ajan koko</string>
   <string name="lockscreen_clock_enable_title">Ota käyttöön</string>
+  <string name="lockscreen_clock_enable_summary">Tilapalkin kello näytetään, jos tämä on pois käytöstä</string>
+  <string name="lockscreen_clock_shadow_title">Varjostus</string>
   <string name="lockscreen_shortcut_add_dialog_title">Lisää pikakuvake</string>
   <string name="lockscreen_shortcut_apps_title">Pikakuvakkeet</string>
   <string name="lockscreen_shortcut_add">Lisää\u2026</string>
@@ -206,6 +209,12 @@
     <string name="screenshot_crop_behavior_summary"></string>-->
   <string name="lockscreen_power_menu_disabled_title">Poista käynnistysvalikko käytöstä lukittuna</string>
   <string name="lockscreen_power_menu_disabled_summary">Poista käynnistysvalikko käytöstä turvatussa lukitusnäytössä</string>
+  <string name="status_bar_quick_qs_pulldown_title">Nopea avaaminen</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">Vasen</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">Oikea</string>
+  <string name="status_bar_quick_qs_pulldown_off">Ei käytössä</string>
+  <string name="status_bar_quick_qs_pulldown_left">Vasen</string>
+  <string name="status_bar_quick_qs_pulldown_right">Oikea</string>
   <!-- Power menu Animations  -->
   <string name="power_menu_animation_title">Käynnistysvalikon animaatio</string>
   <string name="power_menu_animation_dialog_title">Valitse käynnistysvalikon animaatio</string>
@@ -290,12 +299,35 @@
   <string name="battery_percent_always">Aina</string>
   <string name="battery_percent_title">Näytä prosentit</string>
   <string name="status_bar_clock">Kello &amp; päivämäärä</string>
+  <string name="clock_title_enable">Sijoittelu</string>
+  <string name="clock_enabled">Käytössä</string>
+  <string name="clock_disabled">Pois käytöstä</string>
+  <string name="status_bar_clock_style_reset">Nollaa värit</string>
   <string name="status_bar_show_clock_title">Näytä kello &amp; päivämäärä</string>
   <string name="status_bar_am_pm_info">24 tunnin kello on valittu</string>
   <string name="enable_clock_weekday">Viikonpäivä</string>
+  <string name="enable_clock_weekday_summary">Lyhennetty viikonpäivä ennen kellonaikaa</string>
+  <string name="right_clock">Kello oikealla</string>
+  <string name="left_clock">Kello vasemmalla</string>
+  <string name="clock_date_display">Päivämäärä</string>
+  <string name="clock_date_display_summary">Näytä mukautettu päiväys ennen kelloa</string>
+  <string name="clock_date_style">Päivämäärän tyyli</string>
+  <string name="clock_date_position">Päivämäärän sijainti</string>
   <string name="clock_date_format">Päivämäärän muoto</string>
+  <string name="clock_date_string_edittext_title">On oltava DateFormat muodossa esim. MM/dd/yy</string>
+  <string name="clock_date_string_edittext_summary">Syötä merkkijono</string>
+  <string name="clock_date_right">Ajan oikealla puolella</string>
+  <string name="clock_date_left">Ajan vasemmalla puolella</string>
+  <string name="am_pm_clock_normal">Normaali fonttikoko</string>
+  <string name="am_pm_clock_small">Pieni fonttikoko</string>
   <string name="am_pm_clock_none">Älä näytä</string>
   <string name="clock_date_display_none">Älä näytä</string>
+  <string name="clock_date_display_small">Pieni fonttikoko</string>
+  <string name="clock_date_display_normal">Normaali fonttikoko</string>
+  <string name="clock_date_style_normal">Normaali</string>
+  <string name="clock_date_style_lowercase">Pienet kirjaimet</string>
+  <string name="clock_date_style_uppercase">Isot kirjaimet</string>
+  <string name="clock_date_format_custom">Mukautettu java-muoto</string>
   <string name="status_bar_clock_seconds_title">Näytä sekunnit</string>
   <!-- fingerprint authentication vibration -->
   <string name="choose_app">Valitse sovellus</string>
diff --git a/res/values-hu/custom_strings.xml b/res/values-hu/custom_strings.xml
index ab188a3..cf25e97 100644
--- a/res/values-hu/custom_strings.xml
+++ b/res/values-hu/custom_strings.xml
@@ -89,8 +89,8 @@
   <!-- Doze pulse (ambient display) options -->
   <string name="doze_overwrite_value_title">Érték felülírása</string>
   <string name="doze_overwrite_value_summary">Alapértelmezett érték felülírásának engedélyezése felhasználói beállítással</string>
-  <string name="doze_list_mode_title">Szundi mód</string>
-  <string name="doze_list_mode_summary">Szundi mód beállításának lehetősége</string>
+  <string name="doze_list_mode_title">Doze mód</string>
+  <string name="doze_list_mode_summary">Doze mód beállításának lehetősége</string>
   <string name="doze_pulse_title">Idő beállítások</string>
   <string name="doze_pulse_duration_in_title">Beúsztatás</string>
   <string name="doze_pulse_duration_visible_title">Látható időtartam</string>
diff --git a/res/values-it/custom_strings.xml b/res/values-it/custom_strings.xml
index abe2bbc..e57a30e 100644
--- a/res/values-it/custom_strings.xml
+++ b/res/values-it/custom_strings.xml
@@ -82,6 +82,7 @@
   <string name="button_back_kill_timeout_500ms">500 ms</string>
   <string name="button_back_kill_timeout_1000ms">1000 ms</string>
   <string name="button_back_kill_timeout_1500ms">1500 ms</string>
+  <string name="button_back_kill_timeout_2000ms">2000 ms</string>
   <!-- Double tap to sleep -->
   <string name="double_tap_to_sleep_title">Doppio tocco per bloccare</string>
   <string name="double_tap_to_sleep_summary">Doppio tocco sulla barra di stato per spegnere lo schermo</string>
@@ -157,6 +158,7 @@
   <string name="statusbar_title">Barra di stato</string>
   <string name="battery_title">Display della batteria</string>
   <string name="statusbar_battery_summary">Imposta stile visualizzazione stato batteria</string>
+  <string name="clock_title">Ora e data</string>
   <string name="battery_style_title">Stile</string>
   <string name="statusbar_percent_inside_title">Percentuale sovrapposizione</string>
   <string name="statusbar_charging_image_title">Indicatore di carica</string>
@@ -225,12 +227,14 @@
   <string name="status_bar_custom_header_shadow_title">Ombra immagine intestazione</string>
   <string name="status_bar_custom_header_shadow_summary">Per una migliore visibilità su immagini luminose</string>
   <string name="unit_percent">\u0025</string>
+  <string name="static_header_provider_title">Immagine statica</string>
   <string name="custom_header_provider_title">Provider dell\'intestazione</string>
   <string name="custom_header_pick_title">Imposta immagine d\'intestazione</string>
   <string name="style_enabled_summary">Immagine intestazione personalizzata attiva</string>
   <string name="style_disabled_summary">Immagine intestazione personalizzata non attiva</string>
   <string name="header_provider_disabled">Disabilitato</string>
   <string name="custom_header_title">Immagine intestazione personalizzata</string>
+  <string name="file_header_provider_title">Immagine singola</string>
   <!-- Network traffic -->
   <string name="network_traffic_title">Traffico di rete</string>
   <string name="network_traffic_summary">Traffico di rete nella barra di stato</string>
@@ -538,6 +542,29 @@
   <string name="volume_steps_5">5 livelli</string>
   <string name="system_volume_option_title">Volume sistema</string>
   <string name="call_volume_option_title">Volume chiamate</string>
+  <string name="battery_percent_none">Mai</string>
+  <string name="battery_percent_always">Sempre</string>
   <string name="battery_percent_title">Visualizza percentuale</string>
+  <string name="clock_title_enable">Allineamento</string>
+  <string name="clock_enabled">Abilitato</string>
+  <string name="clock_disabled">Disabilitato</string>
+  <string name="status_bar_am_pm_info">Formato 24 ore abilitato</string>
+  <string name="enable_clock_weekday">Giorno della settimana</string>
+  <string name="enable_clock_weekday_summary">Giorno della settimana abbreviato prima dell\'ora</string>
+  <string name="right_clock">Orologio a destra</string>
+  <string name="left_clock">Orologio a sinistra</string>
+  <string name="dont_show">Non mostrare</string>
+  <string name="clock_date_display">Data</string>
+  <string name="clock_date_position">Posizione data</string>
+  <string name="clock_date_format">Formato della data</string>
+  <string name="am_pm_clock_none">Non mostrare</string>
+  <string name="clock_date_display_none">Non mostrare</string>
+  <string name="clock_date_style_normal">Normale</string>
+  <string name="clock_date_style_lowercase">Minuscolo</string>
+  <string name="clock_date_style_uppercase">Maiuscolo</string>
+  <string name="status_bar_clock_seconds_title">Mostra i secondi</string>
   <!-- fingerprint authentication vibration -->
+  <string name="choose_app">Seleziona applicazione</string>
+  <string name="not_ready_summary">Risoluzione...</string>
+  <string name="disabled_entry">Disabilitato</string>
 </resources>
diff --git a/res/values-tr/custom_strings.xml b/res/values-tr/custom_strings.xml
index 82a1c56..c4c89de 100644
--- a/res/values-tr/custom_strings.xml
+++ b/res/values-tr/custom_strings.xml
@@ -455,8 +455,8 @@
   <string name="show_cpu_summary">Mevcûd işlemci bilgisini gösteren yardımcı grafik</string>
   <string name="headset_plugged_notification_title">Kulaklık bildirimi</string>
   <string name="headset_plugged_notification_summary">Kablolu kulaklık bağlandığında bildirim göster</string>
-  <string name="wake_when_plugged_or_unplugged_title">Fişe takıldığında veyâ çıkarıldığında uyan</string>
-  <string name="wake_when_plugged_or_unplugged_summary">Cihazı bir şarj cihazına takdığınızda veyâ şarj cihazından çıkardığınızda cihazı uyandırın</string>
+  <string name="wake_when_plugged_or_unplugged_title">Fişe takıldığında veyâ fişten çıkarıldığında uyan</string>
+  <string name="wake_when_plugged_or_unplugged_summary">Cihazı bir şarj cihazına takdığınızda veyâ bir şarj cihazından çıkardığınızda uyandırın</string>
   <!-- Display : Rotation -->
   <string name="category_display">Ekran</string>
   <string name="display_rotation_disabled">Devre dışı</string>
@@ -499,9 +499,9 @@
   <string name="DESC_MAX_IDLE_TIMEOUT">Kullanmamıza müsaade ettiğiniz azami boşta durma süresi</string>
   <string name="DESC_IDLE_FACTOR">O hal boyunca devir yaptığımız her zaman mevcûd boşta kalma zaman aşımına uygulanacak olan ölçekleme oranı</string>
   <string name="DESC_MIN_TIME_TO_ALARM">Bu, fiilen boşta kalma moduna geçmemiz için gelecek olan bir sonraki îkâza kadar müsâade edeceğimiz asgarî süre</string>
-  <string name="DESC_MAX_TEMP_APP_WHITELIST_DURATION">Bir uygulama yüksek bir alâka gördüğünde uygulamayı geçici olarak güvenli listede tutacak âzamî süre miktarı</string>
-  <string name="DESC_MMS_TEMP_APP_WHITELIST_DURATION">Bir MMS alan uygulamayı güvenli listede tutmayı arzu ettiğimiz süre miktarı</string>
-  <string name="DESC_SMS_TEMP_APP_WHITELIST_DURATION">Bir SMS alan uygulamayı güvenli listede tutmayı arzu ettiğimiz süre miktarı</string>
+  <string name="DESC_MAX_TEMP_APP_WHITELIST_DURATION">Bir uygulama yüksek bir alâka gördüğünde uygulamanın idareten istisna sayılacağı âzamî süre miktarı</string>
+  <string name="DESC_MMS_TEMP_APP_WHITELIST_DURATION">Bir MMS alan uygulamanın istisna sayılacağı süre miktarı</string>
+  <string name="DESC_SMS_TEMP_APP_WHITELIST_DURATION">Bir SMS alan uygulamanın istisna sayılacağı süre miktarı</string>
   <string name="DESC_LIGHT_IDLE_AFTER_INACTIVE_TIMEOUT">Bu, gayri faal olduktan sonra ilk hafif boşta kalma moduna girdiğimiz zamandır</string>
   <string name="DESC_LIGHT_PRE_IDLE_TIMEOUT">Bu, işlerin ve diğer mevcûd faaliyetlerin tamamlanmasını beklerken boşta kalma moduna geçmeye kanaat getirdiğimiz ândan fi\'len boşta kalma moduna geçeceğimiz âna kadar bekleyeceğimiz süre miktarıdır</string>
   <string name="DESC_LIGHT_IDLE_TIMEOUT">Bu, boşta kalma bakımı modunda çalışacağımız ilk zamandır</string>
@@ -511,7 +511,7 @@
   <string name="DESC_LIGHT_IDLE_MAINTENANCE_MAX_BUDGET">Bu, hafiften boşta kalma esnâsında bakım modunun kullanımına sunmayı arzu ettiğimiz âzamî süre miktarıdır</string>
   <string name="DESC_MIN_LIGHT_MAINTENANCE_TIME">Bu, hafif bir uykuya geçtikten sonra bakım modunda kalacağımız asgarî süre miktarıdır</string>
   <string name="DESC_MIN_DEEP_MAINTENANCE_TIME">Bu, tam bir uykuya geçtikten sonra bakım modunda kalacağımız asgarî süre miktarıdır</string>
-  <string name="DESC_KEY_NOTIFICATION_WHITELIST_DURATION">Bir bildirimi ele alan uygulamayı güvenli listede tutmayı arzu ettiğimiz süre miktarı</string>
+  <string name="DESC_KEY_NOTIFICATION_WHITELIST_DURATION">Bir bildirimi ele alan uygulamanın istisna sayılacağı süre miktarı</string>
   <string name="SHORT_INACTIVE_TIMEOUT">Gayri faal zaman aşımı</string>
   <string name="SHORT_SENSING_TIMEOUT">Sensör zaman aşımı</string>
   <string name="SHORT_LOCATING_TIMEOUT">Konumlandırma zaman aşımı</string>
@@ -525,9 +525,9 @@
   <string name="SHORT_MAX_IDLE_TIMEOUT">Âzamî boşta kalma zaman aşımı</string>
   <string name="SHORT_IDLE_FACTOR">Boşta kalma sebebi</string>
   <string name="SHORT_MIN_TIME_TO_ALARM">İkaz edilecek asgarî süre</string>
-  <string name="SHORT_MAX_TEMP_APP_WHITELIST_DURATION">Uygulamanın geçici olarak güvenli listede âzamî tutulma süresi</string>
-  <string name="SHORT_MMS_TEMP_APP_WHITELIST_DURATION">MMS uygulamasının güvenli listede âzamî tutulma süresi</string>
-  <string name="SHORT_SMS_TEMP_APP_WHITELIST_DURATION">SMS uygulamasının güvenli listede âzamî tutulma süresi</string>
+  <string name="SHORT_MAX_TEMP_APP_WHITELIST_DURATION">Uygulamanın idareten istisna listesinde kalacağı âzamî süre</string>
+  <string name="SHORT_MMS_TEMP_APP_WHITELIST_DURATION">MMS uygulamasının istisna listesinde kalacağı âzamî süre</string>
+  <string name="SHORT_SMS_TEMP_APP_WHITELIST_DURATION">SMS uygulamasının istisna listesinde kalacağı âzamî süre</string>
   <string name="SHORT_LIGHT_IDLE_AFTER_INACTIVE_TIMEOUT">Gayri faal zaman aşımından sonra hafif boşta kal</string>
   <string name="SHORT_LIGHT_PRE_IDLE_TIMEOUT">Hafif ön boşta kalma zaman aşımı</string>
   <string name="SHORT_LIGHT_IDLE_TIMEOUT">Hafif boşta kalma zaman aşımı</string>
@@ -537,7 +537,7 @@
   <string name="SHORT_LIGHT_IDLE_MAINTENANCE_MAX_BUDGET">Hafif boşta kalma esnâsındaki bakım modunun âzamî zaman aşımı</string>
   <string name="SHORT_MIN_LIGHT_MAINTENANCE_TIME">Hafif uyku esnâsındaki bakım modunun asgarî zaman aşımı</string>
   <string name="SHORT_MIN_DEEP_MAINTENANCE_TIME">Tam uyku esnâsındaki bakım modunun asgarî zaman aşımı</string>
-  <string name="SHORT_KEY_NOTIFICATION_WHITELIST_DURATION">Bildirimin güvenli listede âzamî tutulma süresi</string>
+  <string name="SHORT_KEY_NOTIFICATION_WHITELIST_DURATION">Bildirimin istisna listesinde kalacağı âzamî süre</string>
   <string name="logcat_app_title">MatLog</string>
   <string name="logcat_app_summary">Kayıtları toplamak için uygulama başlatın</string>
   <string name="show_dashboard_columns_title">Sütun düzenini kullan</string>
diff --git a/res/values-zh-rCN/custom_strings.xml b/res/values-zh-rCN/custom_strings.xml
index c3c646b..ff73725 100644
--- a/res/values-zh-rCN/custom_strings.xml
+++ b/res/values-zh-rCN/custom_strings.xml
@@ -558,7 +558,7 @@
   <string name="screen_off_animation_fade">简单淡入</string>
   <string name="screen_off_animation_color">颜色褪色</string>
   <string name="screen_off_animation_crt">CRT</string>
-  <string name="screen_off_animation_scale">规模</string>
+  <string name="screen_off_animation_scale">比例尺</string>
   <string name="screen_off_animation_title">关屏动画</string>
   <string name="omni_theme_select_title">Omni主题</string>
   <string name="omni_theme_select_none">禁用</string>