merge in oc-release history after reset to oc-dev
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index c8c82e8..060b1d5 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -237,7 +237,7 @@
     <string name="timer_plus_1_min" msgid="8645224089494875062">"Dodaj 1 min"</string>
     <string name="timer_stop" msgid="3361154678667736722">"Zaustavi"</string>
     <string name="timer_stop_all" msgid="9080780442843034376">"Zaustavi sve tajmere"</string>
-    <string name="timer_reset" msgid="7848424809190171640">"Ponovo podesi"</string>
+    <string name="timer_reset" msgid="7848424809190171640">"Resetuj"</string>
     <string name="timer_cancel" msgid="3572868404230815644">"Otkaži"</string>
     <string name="timer_canceled" msgid="7327923392567128060">"Tajmer je otkazan"</string>
     <string name="timer_times_up" msgid="9190440395938519009">"Vreme je isteklo"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index e7f3f26..72aa4f7 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -66,14 +66,14 @@
     <string name="timer_remaining_single" msgid="6782851171906765864">"Остава"</string>
     <string name="timer_remaining_multiple" msgid="6052775962092160851">"Остават"</string>
   <string-array name="alarm_set">
-    <item msgid="6450913786084215050">"Будилникът e настроен за след по-малко от минута."</item>
-    <item msgid="6002066367368421848">"Будилникът е настроен за след <xliff:g id="DAYS">%1$s</xliff:g>."</item>
-    <item msgid="8824719306247973774">"Будилникът е настроен за след <xliff:g id="HOURS">%2$s</xliff:g>."</item>
-    <item msgid="8182406852935468862">"Будилникът е настроен за след <xliff:g id="DAYS">%1$s</xliff:g> и <xliff:g id="HOURS">%2$s</xliff:g>."</item>
-    <item msgid="2532279224777213194">"Будилникът е настроен за след <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
-    <item msgid="5936557894247187717">"Будилникът е настроен за след <xliff:g id="DAYS">%1$s</xliff:g> и <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
+    <item msgid="6450913786084215050">"Будилникът e настроен да звъни след по-малко от минута."</item>
+    <item msgid="6002066367368421848">"Будилникът е настроен да звъни след <xliff:g id="DAYS">%1$s</xliff:g>."</item>
+    <item msgid="8824719306247973774">"Будилникът е настроен да звъни след <xliff:g id="HOURS">%2$s</xliff:g>."</item>
+    <item msgid="8182406852935468862">"Будилникът е настроен да звъни след <xliff:g id="DAYS">%1$s</xliff:g> и <xliff:g id="HOURS">%2$s</xliff:g>."</item>
+    <item msgid="2532279224777213194">"Будилникът е настроен да звъни след <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
+    <item msgid="5936557894247187717">"Будилникът е настроен да звъни след <xliff:g id="DAYS">%1$s</xliff:g> и <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
     <item msgid="9115697840826129603">"Будилникът ще се включи след <xliff:g id="HOURS">%2$s</xliff:g> и <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
-    <item msgid="2332583385137381060">"Будилникът е настроен за след <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> и <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
+    <item msgid="2332583385137381060">"Будилникът е настроен да звъни след <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> и <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
   </string-array>
     <plurals name="days" formatted="false" msgid="3706846447285206235">
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> дни</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 39b664f..9247d2a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -72,7 +72,7 @@
     <item msgid="8182406852935468862">"Alarmen er indstillet til <xliff:g id="DAYS">%1$s</xliff:g> og <xliff:g id="HOURS">%2$s</xliff:g> fra nu."</item>
     <item msgid="2532279224777213194">"Alarmen går i gang om <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
     <item msgid="5936557894247187717">"Alarmen er indstillet til <xliff:g id="DAYS">%1$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g> fra nu."</item>
-    <item msgid="9115697840826129603">"Alarm er indstillet til <xliff:g id="HOURS">%2$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g> fra nu."</item>
+    <item msgid="9115697840826129603">"Alarmen er indstillet til <xliff:g id="HOURS">%2$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g> fra nu."</item>
     <item msgid="2332583385137381060">"Alarm indstillet til <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g> fra nu."</item>
   </string-array>
     <plurals name="days" formatted="false" msgid="3706846447285206235">
@@ -214,12 +214,12 @@
     <string name="minutes_label" msgid="3568098128251438588">"m"</string>
     <string name="seconds_label" msgid="124655952824003246">"s"</string>
     <string name="timer_setup_description" msgid="2488277921227564704">"<xliff:g id="HOURS">%1$s</xliff:g>, <xliff:g id="MINUTES">%2$s</xliff:g> og <xliff:g id="SECONDS">%3$s</xliff:g>"</string>
-    <string name="lap_number_single_digit" msgid="1051159504304610877">"Nr. <xliff:g id="LAPNUMBER">%d</xliff:g>"</string>
-    <string name="lap_number_double_digit" msgid="2138536756534362037">"Nr. <xliff:g id="LAPNUMBER">%02d</xliff:g>"</string>
+    <string name="lap_number_single_digit" msgid="1051159504304610877">"# <xliff:g id="LAPNUMBER">%d</xliff:g>"</string>
+    <string name="lap_number_double_digit" msgid="2138536756534362037">"# <xliff:g id="LAPNUMBER">%02d</xliff:g>"</string>
     <string name="sw_share_main" msgid="7703563468204234405">"Min tid er <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Omgangstider:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Omgang <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="timer_add_timer" msgid="862733633862574752">"Tilføj en timer"</string>
+    <string name="timer_add_timer" msgid="862733633862574752">"Tilføj timer"</string>
     <string name="timer_start" msgid="6158486445614356442">"Start"</string>
     <string name="timer_delete" msgid="8699122001991909302">"Slet"</string>
     <string name="timer_descriptive_delete" msgid="8794915342760383536">"Slet <xliff:g id="NUMBER_STRING">%s</xliff:g>"</string>
@@ -392,9 +392,9 @@
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/<xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="world_time_ahead" msgid="625559988238637652">"<xliff:g id="TIME">%1$s</xliff:g> foran"</string>
     <string name="world_time_behind" msgid="5395771290726167865">"<xliff:g id="TIME">%1$s</xliff:g> bagud"</string>
-    <string name="world_hours_minutes_ahead" msgid="5132012793021696377">"<xliff:g id="HOURS">%1$s</xliff:g> og <xliff:g id="MINUTES">%2$s</xliff:g> foran"</string>
+    <string name="world_hours_minutes_ahead" msgid="5132012793021696377">"<xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g> foran"</string>
     <string name="world_hours_minutes_behind" msgid="8978567362140923698">"<xliff:g id="HOURS">%1$s</xliff:g> og <xliff:g id="MINUTES">%2$s</xliff:g> bagud"</string>
-    <string name="world_hours_tomorrow" msgid="2504465609269004794">"I morgen kl. <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="world_hours_tomorrow" msgid="2504465609269004794">"I morgen, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="world_hours_yesterday" msgid="4425086322610882745">"I går kl. <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="world_tomorrow" msgid="7633067935455580920">"I morgen"</string>
     <string name="world_yesterday" msgid="5430990920477833164">"I går"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index d0a852c..62000be 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -392,7 +392,7 @@
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="world_time_ahead" msgid="625559988238637652">"<xliff:g id="TIME">%1$s</xliff:g> aurrerago"</string>
     <string name="world_time_behind" msgid="5395771290726167865">"<xliff:g id="TIME">%1$s</xliff:g> atzerago"</string>
-    <string name="world_hours_minutes_ahead" msgid="5132012793021696377">"<xliff:g id="HOURS">%1$s</xliff:g> eta <xliff:g id="MINUTES">%2$s</xliff:g> aurrerago doaz"</string>
+    <string name="world_hours_minutes_ahead" msgid="5132012793021696377">"<xliff:g id="HOURS">%1$s</xliff:g> eta <xliff:g id="MINUTES">%2$s</xliff:g> aurrerago"</string>
     <string name="world_hours_minutes_behind" msgid="8978567362140923698">"<xliff:g id="HOURS">%1$s</xliff:g> eta <xliff:g id="MINUTES">%2$s</xliff:g> atzerago doaz"</string>
     <string name="world_hours_tomorrow" msgid="2504465609269004794">"Bihar (<xliff:g id="TIME">%1$s</xliff:g>)"</string>
     <string name="world_hours_yesterday" msgid="4425086322610882745">"Atzo (<xliff:g id="TIME">%1$s</xliff:g>)"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index bfbf985..e892245 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -61,8 +61,8 @@
     <string name="timer_notifications_hours_seconds" msgid="8168090805113197804">"<xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="SECONDS"> %4$s</xliff:g><xliff:g id="REMAINING"> %3$s</xliff:g>"</string>
     <string name="timer_notifications_hours_minutes_seconds" msgid="4666176878038730417">"<xliff:g id="HOURS">%1$s</xliff:g><xliff:g id="MINUTES"> %2$s</xliff:g><xliff:g id="SECONDS"> %4$s</xliff:g><xliff:g id="REMAINING"> %3$s</xliff:g>"</string>
     <string name="timer_accessibility_one_minute_added" msgid="6096646178998456004">"Satu menit ditambahkan ke pewaktu, <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="timer_accessibility_stopped" msgid="2753501043114605474">"Pewaktu dijeda, <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="timer_accessibility_started" msgid="8503877052873671219">"Pewaktu terus berjalan, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="timer_accessibility_stopped" msgid="2753501043114605474">"Timer dijeda, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="timer_accessibility_started" msgid="8503877052873671219">"Timer terus berjalan, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="timer_remaining_single" msgid="6782851171906765864">"tersisa"</string>
     <string name="timer_remaining_multiple" msgid="6052775962092160851">"tersisa"</string>
   <string-array name="alarm_set">
@@ -219,7 +219,7 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Waktu saya adalah <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Waktu putaran:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Putaran <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="timer_add_timer" msgid="862733633862574752">"Tambahkan Pewaktu"</string>
+    <string name="timer_add_timer" msgid="862733633862574752">"Tambahkan Timer"</string>
     <string name="timer_start" msgid="6158486445614356442">"Mulai"</string>
     <string name="timer_delete" msgid="8699122001991909302">"Hapus"</string>
     <string name="timer_descriptive_delete" msgid="8794915342760383536">"Hapus <xliff:g id="NUMBER_STRING">%s</xliff:g>"</string>
@@ -230,13 +230,13 @@
     <string name="timer_stop_all" msgid="9080780442843034376">"Menghentikan semua pewaktu"</string>
     <string name="timer_reset" msgid="7848424809190171640">"Setel ulang"</string>
     <string name="timer_cancel" msgid="3572868404230815644">"Batal"</string>
-    <string name="timer_canceled" msgid="7327923392567128060">"Pewaktu dibatalkan"</string>
+    <string name="timer_canceled" msgid="7327923392567128060">"Timer dibatalkan"</string>
     <string name="timer_times_up" msgid="9190440395938519009">"Waktu habis"</string>
     <string name="timer_multi_times_up" msgid="1239104626836080409">"<xliff:g id="NUM_TIMERS">%d</xliff:g> pewaktu telah berakhir"</string>
     <string name="timer_multi_missed" msgid="9085073572920385362">"<xliff:g id="NUMBER">%d</xliff:g> pewaktu terlewat"</string>
     <string name="timer_notification_label" msgid="4933184831583137249">"Timer"</string>
-    <string name="missed_timer_notification_label" msgid="6661928727623284334">"Pewaktu terlewat"</string>
-    <string name="missed_named_timer_notification_label" msgid="665604640028289175">"Pewaktu terlewat: <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="missed_timer_notification_label" msgid="6661928727623284334">"Timer terlewat"</string>
+    <string name="missed_named_timer_notification_label" msgid="665604640028289175">"Timer terlewat: <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="timer_pause" msgid="3748323712728398743">"Jeda"</string>
     <string name="timer_reset_all" msgid="7530633132757866087">"Setel ulang semua pewaktu"</string>
     <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>.<xliff:g id="MINUTES">%02d</xliff:g>.<xliff:g id="SECONDS">%02d</xliff:g>"</string>
@@ -360,7 +360,7 @@
   </string-array>
     <string name="shortcut_new_alarm_short" msgid="3490418929139725538">"Alarm baru"</string>
     <string name="shortcut_new_alarm_long" msgid="4778064830147981089">"Buat alarm baru"</string>
-    <string name="shortcut_new_timer_short" msgid="3793414543219297884">"Pewaktu baru"</string>
+    <string name="shortcut_new_timer_short" msgid="3793414543219297884">"Timer baru"</string>
     <string name="shortcut_new_timer_long" msgid="5194092459678096067">"Buat pewaktu baru"</string>
     <string name="shortcut_start_stopwatch_short" msgid="5469715764277476796">"Mulai"</string>
     <string name="shortcut_start_stopwatch_long" msgid="9183061797046030376">"Mulai stopwatch"</string>
@@ -376,12 +376,12 @@
     <string name="description_direction_left" msgid="7448141043674998679">"Geser ke kiri untuk menunda"</string>
     <string name="description_direction_both" msgid="1841309486023845685">"Gesek ke kiri untuk menunda atau ke kanan untuk menutup"</string>
     <string name="timer_settings" msgid="7955522143086154795">"Timer"</string>
-    <string name="timer_vibrate_title" msgid="7788920024785587518">"Pewaktu bergetar"</string>
-    <string name="timer_paused" msgid="5941160896040771462">"Pewaktu dijeda"</string>
+    <string name="timer_vibrate_title" msgid="7788920024785587518">"Timer bergetar"</string>
+    <string name="timer_paused" msgid="5941160896040771462">"Timer dijeda"</string>
     <string name="timers_stopped" msgid="3186191253226005149">"<xliff:g id="NUMBER">%d</xliff:g> pewaktu dijeda"</string>
     <string name="all_timers_stopped_notif" msgid="883027111895833440">"Ketuk untuk melihat pewaktu Anda"</string>
     <string name="timers_in_use" msgid="5570729467344408506">"<xliff:g id="NUMBER">%d</xliff:g> timer"</string>
-    <string name="next_timer_notif" msgid="6136454740115613653">"Pewaktu Berikutnya: <xliff:g id="TIME_REMAINING">%s</xliff:g>"</string>
+    <string name="next_timer_notif" msgid="6136454740115613653">"Timer Berikutnya: <xliff:g id="TIME_REMAINING">%s</xliff:g>"</string>
     <string name="screensaver_settings" msgid="1780742944194267226">"Setelan screen saver"</string>
     <string name="night_mode_title" msgid="5983813889469616299">"Mode malam"</string>
     <string name="night_mode_summary" msgid="1017350187324162631">"Tampilan yang sangat redup (untuk ruangan gelap)"</string>
@@ -408,8 +408,8 @@
     <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Tidak ada jadwal alarm untuk waktu ini"</string>
     <string name="alarm_is_dismissed" msgid="5509897230565826642">"Alarm pukul <xliff:g id="ALARM_TIME">%s</xliff:g> ditutup"</string>
     <string name="alarm_is_set" msgid="5503226382620011088">"Alarm disetel untuk <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
-    <string name="timer_created" msgid="4381027137335885547">"Pewaktu telah dibuat"</string>
-    <string name="timer_deleted" msgid="9110322362460029392">"Pewaktu dihapus"</string>
+    <string name="timer_created" msgid="4381027137335885547">"Timer telah dibuat"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Timer dihapus"</string>
     <string name="invalid_timer_length" msgid="3104567893212932487">"Lamanya pewaktu tidak valid"</string>
     <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Alarm pukul <xliff:g id="ALARM_TIME">%s</xliff:g> belum dapat ditutup, masih 24 jam lagi"</string>
     <string name="dismiss_alarm" msgid="7204593078688533541">"Tutup alarm"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index eba2bdd..41f311f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -22,11 +22,11 @@
     <string name="default_label" msgid="5590025289805630372">"שעון מעורר"</string>
     <string name="alarm_vibrate" msgid="3476686921490362230">"רטט"</string>
     <string name="alarm_repeat" msgid="7242985466344233206">"חוזר"</string>
-    <string name="delete" msgid="5732434972457000541">"מחק"</string>
+    <string name="delete" msgid="5732434972457000541">"מחיקה"</string>
     <string name="default_alarm_ringtone_title" msgid="2916376768509623643">"צליל ברירת המחדל להתראה"</string>
     <string name="alarm_sound" msgid="8754499591391638405">"צליל שעון מעורר"</string>
     <string name="timer_sound" msgid="896163086604894735">"צליל טיימר"</string>
-    <string name="add_new_sound" msgid="2546936797351540244">"הוסף חדש"</string>
+    <string name="add_new_sound" msgid="2546936797351540244">"צליל חדש"</string>
     <string name="remove_sound" msgid="2064643204455734239">"הסר"</string>
     <string name="confirm_remove_custom_ringtone" msgid="1724111242265208553">"התראות וטיימרים המשתמשים בצליל זה ישמיעו במקומו את צליל ברירת המחדל."</string>
     <string name="your_sounds" msgid="1672779351352629681">"הצלילים שלך"</string>
@@ -35,10 +35,10 @@
     <string name="default_timer_ringtone_title" msgid="1370799536406862317">"הטיימר סיים"</string>
     <string name="alarm_tomorrow" msgid="131356848787643420">"מחר"</string>
     <string name="alarm_today" msgid="7873594221106531654">"היום"</string>
-    <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"דחה"</string>
+    <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"שמענו אותך"</string>
     <string name="alarm_missed_title" msgid="3828345099754063392">"החמצת התראה"</string>
     <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> ‏- <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
-    <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"מושהית"</string>
+    <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"מצב נודניק"</string>
     <plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
       <item quantity="two"><xliff:g id="NUMBER">%d</xliff:g> דקות</item>
       <item quantity="many"><xliff:g id="NUMBER">%d</xliff:g> דקות</item>
@@ -205,7 +205,7 @@
     <string name="volume_button_setting_title" msgid="6937131248843413357">"לחצני עוצמת קול"</string>
   <string-array name="volume_button_setting_entries">
     <item msgid="7972756698723318690">"נודניק"</item>
-    <item msgid="3450979320164769576">"דחה"</item>
+    <item msgid="3450979320164769576">"שמענו אותך"</item>
     <item msgid="7085774139907653538">"שליטה בעוצמת הקול"</item>
   </string-array>
     <string name="label_description" msgid="8736179296142915727">"תווית"</string>
@@ -223,11 +223,11 @@
     <string name="menu_item_sort_by_name" msgid="1762931290495104106">"מיין לפי שם"</string>
     <string name="selected_cities_label" msgid="3607479399424246605">"ערים נבחרות"</string>
     <string name="sw_resume_button" msgid="2569360966002022248">"המשך"</string>
-    <string name="sw_reset_button" msgid="6616804728322906117">"אפס"</string>
+    <string name="sw_reset_button" msgid="6616804728322906117">"איפוס"</string>
     <string name="sw_start_button" msgid="8373422516681242270">"התחל"</string>
     <string name="sw_pause_button" msgid="2422084453454138042">"השהה"</string>
     <string name="sw_lap_button" msgid="6992264696039004233">"הקפה"</string>
-    <string name="sw_share_button" msgid="4478648110382859382">"שתף"</string>
+    <string name="sw_share_button" msgid="4478648110382859382">"שיתוף"</string>
     <string name="hours_label" msgid="3393478155635368097">"ש\'"</string>
     <string name="minutes_label" msgid="3568098128251438588">"ד\'"</string>
     <string name="seconds_label" msgid="124655952824003246">"שנ\'"</string>
@@ -237,17 +237,17 @@
     <string name="sw_share_main" msgid="7703563468204234405">"הזמן שלי הוא <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"זמני הקפה:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"הקפה <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="timer_add_timer" msgid="862733633862574752">"הוסף טיימר"</string>
+    <string name="timer_add_timer" msgid="862733633862574752">"הוספת טיימר"</string>
     <string name="timer_start" msgid="6158486445614356442">"התחל"</string>
-    <string name="timer_delete" msgid="8699122001991909302">"מחק"</string>
+    <string name="timer_delete" msgid="8699122001991909302">"מחיקה"</string>
     <string name="timer_descriptive_delete" msgid="8794915342760383536">"מחק את <xliff:g id="NUMBER_STRING">%s</xliff:g>"</string>
-    <string name="timer_plus_one" msgid="6631211310420106116">"הוסף דקה"</string>
+    <string name="timer_plus_one" msgid="6631211310420106116">"הוספת דקה"</string>
     <string name="timer_add_minute" msgid="207816824783281446">"+ 1:00"</string>
-    <string name="timer_plus_1_min" msgid="8645224089494875062">"הוסף דקה"</string>
+    <string name="timer_plus_1_min" msgid="8645224089494875062">"הוספת דקה"</string>
     <string name="timer_stop" msgid="3361154678667736722">"עצור"</string>
     <string name="timer_stop_all" msgid="9080780442843034376">"הפסק את כל הטיימרים"</string>
-    <string name="timer_reset" msgid="7848424809190171640">"אפס"</string>
-    <string name="timer_cancel" msgid="3572868404230815644">"בטל"</string>
+    <string name="timer_reset" msgid="7848424809190171640">"איפוס"</string>
+    <string name="timer_cancel" msgid="3572868404230815644">"ביטול"</string>
     <string name="timer_canceled" msgid="7327923392567128060">"הטיימר בוטל"</string>
     <string name="timer_times_up" msgid="9190440395938519009">"נגמר הזמן"</string>
     <string name="timer_multi_times_up" msgid="1239104626836080409">"הפעולה של <xliff:g id="NUM_TIMERS">%d</xliff:g> טיימרים הושלמה"</string>
@@ -390,9 +390,9 @@
     <string name="timer_service_desc" msgid="2256002649882602433">"מעבד פעולות מההודעות של הטיימר."</string>
     <string name="stopwatch_service_desc" msgid="9220132827343760767">"מעבד פעולות מההודעות של שעון העצר."</string>
     <string name="swn_paused" msgid="6364358842808263589">"מושהה"</string>
-    <string name="description_direction_right" msgid="5709209043267548985">"החלק ימינה כדי לבטל"</string>
+    <string name="description_direction_right" msgid="5709209043267548985">"החלקה ימינה מפסיקה את הצלצול"</string>
     <string name="description_direction_left" msgid="7448141043674998679">"החלק שמאלה כדי להפעיל נודניק"</string>
-    <string name="description_direction_both" msgid="1841309486023845685">"החלק שמאלה כדי להעביר למצב נודניק או ימינה כדי לסגור"</string>
+    <string name="description_direction_both" msgid="1841309486023845685">"החלקה שמאלה מעבירה למצב נודניק וימינה מפסיקה את הצלצול"</string>
     <string name="timer_settings" msgid="7955522143086154795">"טיימרים"</string>
     <string name="timer_vibrate_title" msgid="7788920024785587518">"רטט טיימר"</string>
     <string name="timer_paused" msgid="5941160896040771462">"הטיימר מושהה"</string>
@@ -405,7 +405,7 @@
     <string name="night_mode_summary" msgid="1017350187324162631">"תצוגה עמומה מאוד (לחדרים חשוכים)"</string>
     <string name="expand_alarm" msgid="7392616528943305020">"הרחב התראה"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"כווץ התראה"</string>
-    <string name="alarm_undo" msgid="5710042601177655254">"בטל"</string>
+    <string name="alarm_undo" msgid="5710042601177655254">"ביטול"</string>
     <string name="alarm_deleted" msgid="6131529309389084785">"ההתראה נמחקה"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="world_time_ahead" msgid="625559988238637652">"<xliff:g id="TIME">%1$s</xliff:g> יותר"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 3017afa..9498e16 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -372,8 +372,8 @@
     <string name="timer_service_desc" msgid="2256002649882602433">"Таймер хабарландыруларынан әрекеттерді өңдейді."</string>
     <string name="stopwatch_service_desc" msgid="9220132827343760767">"Секундөлшегіш хабарландыруларынан әрекеттерді өңдейді."</string>
     <string name="swn_paused" msgid="6364358842808263589">"Кідіртілген"</string>
-    <string name="description_direction_right" msgid="5709209043267548985">"Қабылдамау үшін оңға жанаңыз"</string>
-    <string name="description_direction_left" msgid="7448141043674998679">"Кейінге қалдыру үшін солға жанаңыз"</string>
+    <string name="description_direction_right" msgid="5709209043267548985">"Қабылдамау үшін оңға қарай сипаңыз"</string>
+    <string name="description_direction_left" msgid="7448141043674998679">"Кейінге қалдыру үшін солға қарай сипаңыз"</string>
     <string name="description_direction_both" msgid="1841309486023845685">"Кідірту үшін солға, ал өшіру үшін оңға сырғытыңыз"</string>
     <string name="timer_settings" msgid="7955522143086154795">"Таймерлер"</string>
     <string name="timer_vibrate_title" msgid="7788920024785587518">"Таймердің дірілі"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 4fcab32..f5ef2a0 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -38,7 +38,7 @@
     <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"खारेज गर्नुहोस्"</string>
     <string name="alarm_missed_title" msgid="3828345099754063392">"छुटेको आलार्म"</string>
     <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
-    <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"स्नुज भयो"</string>
+    <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"स्नुज गरियो"</string>
     <plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> मिनेट</item>
       <item quantity="one">1 मिनेट</item>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index fb9e5ed..cfa0de3 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -219,7 +219,7 @@
     <string name="sw_share_main" msgid="7703563468204234405">"ਮੇਰਾ ਸਮਾਂ ਹੈ <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"ਲੈਪ ਸਮੇਂ:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"ਲੈਪ <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="timer_add_timer" msgid="862733633862574752">"ਟਾਈਮਰ ਜੋੜੋ"</string>
+    <string name="timer_add_timer" msgid="862733633862574752">"ਟਾਈਮਰ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="timer_start" msgid="6158486445614356442">"ਚਾਲੂ ਕਰੋ"</string>
     <string name="timer_delete" msgid="8699122001991909302">"ਮਿਟਾਓ"</string>
     <string name="timer_descriptive_delete" msgid="8794915342760383536">"<xliff:g id="NUMBER_STRING">%s</xliff:g> ਨੂੰ ਮਿਟਾਓ"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c7df72c..d41cfb6 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -47,9 +47,9 @@
     <string name="alarm_alert_off_text" msgid="4472073417593915002">"Alarmă oprită"</string>
     <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Amânați"</string>
     <plurals name="alarm_alert_snooze_set" formatted="false" msgid="3212729193036041768">
-      <item quantity="few">Se amână pentru <xliff:g id="MINUTES">%d</xliff:g> minute.</item>
-      <item quantity="other">Se amână pentru <xliff:g id="MINUTES">%d</xliff:g> de minute.</item>
-      <item quantity="one">Se amână pentru un minut.</item>
+      <item quantity="few">Se amână <xliff:g id="MINUTES">%d</xliff:g> minute.</item>
+      <item quantity="other">Se amână <xliff:g id="MINUTES">%d</xliff:g> de minute.</item>
+      <item quantity="one">Se amână un minut.</item>
     </plurals>
     <string name="alarm_alert_snooze_until" msgid="6958013659168344550">"Se amână până <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="alarm_alert_predismiss_title" msgid="5723945586913705445">"Alarma următoare"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 0637c2d..f075136 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -193,9 +193,9 @@
     <string name="label_description" msgid="8736179296142915727">"ලේබලය"</string>
     <string name="ringtone_description" msgid="7580922112921069925">"රිංග්ටෝනය"</string>
     <string name="menu_alarm" msgid="4772010125376647519">"සීනුව"</string>
-    <string name="menu_timer" msgid="6459070074762877114">"කාල ගණනය"</string>
+    <string name="menu_timer" msgid="6459070074762877114">"කාලමාපකය"</string>
     <string name="menu_clock" msgid="5612760670606829805">"ඔරලෝසුව"</string>
-    <string name="menu_stopwatch" msgid="3396117705293574701">"කාල ඝනකය"</string>
+    <string name="menu_stopwatch" msgid="3396117705293574701">"විරාම ඝටිකාව"</string>
     <string name="button_alarms" msgid="3907838219512538763">"ඇඟවීමක් එක් කරන්න"</string>
     <string name="button_cities" msgid="4555761857494501363">"නගර"</string>
     <string name="menu_item_settings" msgid="1413723516369078665">"සැකසුම්"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 0ac8f66..e7b277b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -48,10 +48,10 @@
     <string name="alarm_alert_off_text" msgid="4472073417593915002">"Budík je vypnutý"</string>
     <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Odložiť"</string>
     <plurals name="alarm_alert_snooze_set" formatted="false" msgid="3212729193036041768">
-      <item quantity="few">Odložiť o <xliff:g id="MINUTES">%d</xliff:g> minúty.</item>
-      <item quantity="many">Odložiť o <xliff:g id="MINUTES">%d</xliff:g> minúty.</item>
-      <item quantity="other">Odložiť o <xliff:g id="MINUTES">%d</xliff:g> minút.</item>
-      <item quantity="one">Odložiť o 1 minútu.</item>
+      <item quantity="few">Odložené o <xliff:g id="MINUTES">%d</xliff:g> minúty</item>
+      <item quantity="many">Odložené o <xliff:g id="MINUTES">%d</xliff:g> minúty</item>
+      <item quantity="other">Odložené o <xliff:g id="MINUTES">%d</xliff:g> minút</item>
+      <item quantity="one">Odložené o 1 minútu</item>
     </plurals>
     <string name="alarm_alert_snooze_until" msgid="6958013659168344550">"Odložené do <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="alarm_alert_predismiss_title" msgid="5723945586913705445">"Nadchádzajúci budík"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 97f475d..3dac5f5 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -237,7 +237,7 @@
     <string name="timer_plus_1_min" msgid="8645224089494875062">"Додај 1 мин"</string>
     <string name="timer_stop" msgid="3361154678667736722">"Заустави"</string>
     <string name="timer_stop_all" msgid="9080780442843034376">"Заустави све тајмере"</string>
-    <string name="timer_reset" msgid="7848424809190171640">"Поново подеси"</string>
+    <string name="timer_reset" msgid="7848424809190171640">"Ресетуј"</string>
     <string name="timer_cancel" msgid="3572868404230815644">"Откажи"</string>
     <string name="timer_canceled" msgid="7327923392567128060">"Тајмер је отказан"</string>
     <string name="timer_times_up" msgid="9190440395938519009">"Време је истекло"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 42bd947..9c02219 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -38,7 +38,7 @@
     <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"O‘chirish"</string>
     <string name="alarm_missed_title" msgid="3828345099754063392">"O‘tkazib yuborilgan signal"</string>
     <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
-    <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Mudratilgan"</string>
+    <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Kechiktirildi"</string>
     <plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> daq</item>
       <item quantity="one">1 daq</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1c39dca..15e0221 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -25,10 +25,10 @@
     <string name="delete" msgid="5732434972457000541">"删除"</string>
     <string name="default_alarm_ringtone_title" msgid="2916376768509623643">"默认闹钟提示音"</string>
     <string name="alarm_sound" msgid="8754499591391638405">"闹钟提示音"</string>
-    <string name="timer_sound" msgid="896163086604894735">"计时器提示音"</string>
+    <string name="timer_sound" msgid="896163086604894735">"定时器提示音"</string>
     <string name="add_new_sound" msgid="2546936797351540244">"新增"</string>
     <string name="remove_sound" msgid="2064643204455734239">"移除"</string>
-    <string name="confirm_remove_custom_ringtone" msgid="1724111242265208553">"使用此提示音的闹钟和计时器将改为播放默认提示音。"</string>
+    <string name="confirm_remove_custom_ringtone" msgid="1724111242265208553">"使用此提示音的闹钟和定时器将改为播放默认提示音。"</string>
     <string name="your_sounds" msgid="1672779351352629681">"您的提示音"</string>
     <string name="device_sounds" msgid="1584894148222639823">"设备提示音"</string>
     <string name="custom_ringtone_lost_permissions" msgid="3406310054255354331">"无法访问提示音内容。"</string>
@@ -60,9 +60,9 @@
     <string name="timer_notifications_minutes_seconds" msgid="7059651926379491350">"<xliff:g id="REMAINING"> %3$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g> <xliff:g id="SECONDS"> %4$s</xliff:g>"</string>
     <string name="timer_notifications_hours_seconds" msgid="8168090805113197804">"<xliff:g id="REMAINING"> %3$s</xliff:g> <xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="SECONDS"> %4$s</xliff:g>"</string>
     <string name="timer_notifications_hours_minutes_seconds" msgid="4666176878038730417">"<xliff:g id="REMAINING"> %3$s</xliff:g> <xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES"> %2$s</xliff:g> <xliff:g id="SECONDS"> %4$s</xliff:g>"</string>
-    <string name="timer_accessibility_one_minute_added" msgid="6096646178998456004">"计时器已增加一分钟,<xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="timer_accessibility_stopped" msgid="2753501043114605474">"计时器已暂停,<xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="timer_accessibility_started" msgid="8503877052873671219">"计时器运行中,<xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="timer_accessibility_one_minute_added" msgid="6096646178998456004">"定时器已增加一分钟,<xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="timer_accessibility_stopped" msgid="2753501043114605474">"定时器已暂停,<xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="timer_accessibility_started" msgid="8503877052873671219">"定时器运行中,<xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="timer_remaining_single" msgid="6782851171906765864">"还剩"</string>
     <string name="timer_remaining_multiple" msgid="6052775962092160851">"还剩"</string>
   <string-array name="alarm_set">
@@ -193,7 +193,7 @@
     <string name="label_description" msgid="8736179296142915727">"标签"</string>
     <string name="ringtone_description" msgid="7580922112921069925">"铃声"</string>
     <string name="menu_alarm" msgid="4772010125376647519">"闹钟"</string>
-    <string name="menu_timer" msgid="6459070074762877114">"计时器"</string>
+    <string name="menu_timer" msgid="6459070074762877114">"定时器"</string>
     <string name="menu_clock" msgid="5612760670606829805">"时钟"</string>
     <string name="menu_stopwatch" msgid="3396117705293574701">"秒表"</string>
     <string name="button_alarms" msgid="3907838219512538763">"添加闹钟"</string>
@@ -219,7 +219,7 @@
     <string name="sw_share_main" msgid="7703563468204234405">"我的时间:<xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"各圈时间:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"第<xliff:g id="NUMBER">%d</xliff:g>圈"</string>
-    <string name="timer_add_timer" msgid="862733633862574752">"添加计时器"</string>
+    <string name="timer_add_timer" msgid="862733633862574752">"添加定时器"</string>
     <string name="timer_start" msgid="6158486445614356442">"开始"</string>
     <string name="timer_delete" msgid="8699122001991909302">"删除"</string>
     <string name="timer_descriptive_delete" msgid="8794915342760383536">"删除 <xliff:g id="NUMBER_STRING">%s</xliff:g>"</string>
@@ -227,18 +227,18 @@
     <string name="timer_add_minute" msgid="207816824783281446">"+ 1:00"</string>
     <string name="timer_plus_1_min" msgid="8645224089494875062">"加上1分钟"</string>
     <string name="timer_stop" msgid="3361154678667736722">"停止"</string>
-    <string name="timer_stop_all" msgid="9080780442843034376">"停止所有计时器"</string>
+    <string name="timer_stop_all" msgid="9080780442843034376">"停止所有定时器"</string>
     <string name="timer_reset" msgid="7848424809190171640">"重置"</string>
     <string name="timer_cancel" msgid="3572868404230815644">"取消"</string>
-    <string name="timer_canceled" msgid="7327923392567128060">"已取消计时器"</string>
+    <string name="timer_canceled" msgid="7327923392567128060">"已取消定时器"</string>
     <string name="timer_times_up" msgid="9190440395938519009">"时间到"</string>
-    <string name="timer_multi_times_up" msgid="1239104626836080409">"<xliff:g id="NUM_TIMERS">%d</xliff:g> 个计时器已到期"</string>
-    <string name="timer_multi_missed" msgid="9085073572920385362">"错过了 <xliff:g id="NUMBER">%d</xliff:g> 个计时器"</string>
-    <string name="timer_notification_label" msgid="4933184831583137249">"计时器"</string>
-    <string name="missed_timer_notification_label" msgid="6661928727623284334">"错过的计时器"</string>
-    <string name="missed_named_timer_notification_label" msgid="665604640028289175">"错过的计时器:<xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="timer_multi_times_up" msgid="1239104626836080409">"<xliff:g id="NUM_TIMERS">%d</xliff:g> 个定时器已到期"</string>
+    <string name="timer_multi_missed" msgid="9085073572920385362">"错过了 <xliff:g id="NUMBER">%d</xliff:g> 个定时器"</string>
+    <string name="timer_notification_label" msgid="4933184831583137249">"定时器"</string>
+    <string name="missed_timer_notification_label" msgid="6661928727623284334">"错过的定时器"</string>
+    <string name="missed_named_timer_notification_label" msgid="665604640028289175">"错过的定时器:<xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="timer_pause" msgid="3748323712728398743">"暂停"</string>
-    <string name="timer_reset_all" msgid="7530633132757866087">"重置所有计时器"</string>
+    <string name="timer_reset_all" msgid="7530633132757866087">"重置所有定时器"</string>
     <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
     <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
     <!-- no translation found for seconds (6550091082396571898) -->
@@ -360,8 +360,8 @@
   </string-array>
     <string name="shortcut_new_alarm_short" msgid="3490418929139725538">"新闹钟"</string>
     <string name="shortcut_new_alarm_long" msgid="4778064830147981089">"设置新闹钟"</string>
-    <string name="shortcut_new_timer_short" msgid="3793414543219297884">"新计时器"</string>
-    <string name="shortcut_new_timer_long" msgid="5194092459678096067">"设置新计时器"</string>
+    <string name="shortcut_new_timer_short" msgid="3793414543219297884">"新定时器"</string>
+    <string name="shortcut_new_timer_long" msgid="5194092459678096067">"设置新定时器"</string>
     <string name="shortcut_start_stopwatch_short" msgid="5469715764277476796">"启动"</string>
     <string name="shortcut_start_stopwatch_long" msgid="9183061797046030376">"启动秒表"</string>
     <string name="shortcut_pause_stopwatch_short" msgid="4022667323693785830">"暂停"</string>
@@ -369,19 +369,19 @@
     <string name="shortcut_start_screensaver_short" msgid="3414762073311954753">"屏保"</string>
     <string name="shortcut_start_screensaver_long" msgid="6134275671119484907">"启动屏保"</string>
     <string name="alarm_settings" msgid="2947147071388290814">"闹钟"</string>
-    <string name="timer_service_desc" msgid="2256002649882602433">"处理可通过计时器通知执行的操作。"</string>
+    <string name="timer_service_desc" msgid="2256002649882602433">"处理可通过定时器通知执行的操作。"</string>
     <string name="stopwatch_service_desc" msgid="9220132827343760767">"处理可通过秒表通知执行的操作。"</string>
     <string name="swn_paused" msgid="6364358842808263589">"已暂停"</string>
     <string name="description_direction_right" msgid="5709209043267548985">"向右滑动可关闭闹钟"</string>
     <string name="description_direction_left" msgid="7448141043674998679">"向左滑动可暂停闹钟"</string>
     <string name="description_direction_both" msgid="1841309486023845685">"向左滑动可暂停,向右滑动可关闭"</string>
-    <string name="timer_settings" msgid="7955522143086154795">"计时器"</string>
-    <string name="timer_vibrate_title" msgid="7788920024785587518">"计时器振动"</string>
-    <string name="timer_paused" msgid="5941160896040771462">"计时器已暂停"</string>
-    <string name="timers_stopped" msgid="3186191253226005149">"<xliff:g id="NUMBER">%d</xliff:g> 个计时器已暂停"</string>
-    <string name="all_timers_stopped_notif" msgid="883027111895833440">"点按即可查看您的计时器"</string>
-    <string name="timers_in_use" msgid="5570729467344408506">"<xliff:g id="NUMBER">%d</xliff:g>个计时器"</string>
-    <string name="next_timer_notif" msgid="6136454740115613653">"下一个计时器:<xliff:g id="TIME_REMAINING">%s</xliff:g>"</string>
+    <string name="timer_settings" msgid="7955522143086154795">"定时器"</string>
+    <string name="timer_vibrate_title" msgid="7788920024785587518">"定时器振动"</string>
+    <string name="timer_paused" msgid="5941160896040771462">"定时器已暂停"</string>
+    <string name="timers_stopped" msgid="3186191253226005149">"<xliff:g id="NUMBER">%d</xliff:g> 个定时器已暂停"</string>
+    <string name="all_timers_stopped_notif" msgid="883027111895833440">"点按即可查看您的定时器"</string>
+    <string name="timers_in_use" msgid="5570729467344408506">"<xliff:g id="NUMBER">%d</xliff:g>个定时器"</string>
+    <string name="next_timer_notif" msgid="6136454740115613653">"下一个定时器:<xliff:g id="TIME_REMAINING">%s</xliff:g>"</string>
     <string name="screensaver_settings" msgid="1780742944194267226">"屏保设置"</string>
     <string name="night_mode_title" msgid="5983813889469616299">"夜间模式"</string>
     <string name="night_mode_summary" msgid="1017350187324162631">"将屏幕亮度调至非常低(适合光线昏暗的环境)"</string>
@@ -408,9 +408,9 @@
     <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"未设置这个时间的闹钟"</string>
     <string name="alarm_is_dismissed" msgid="5509897230565826642">"已关闭 <xliff:g id="ALARM_TIME">%s</xliff:g> 的闹钟"</string>
     <string name="alarm_is_set" msgid="5503226382620011088">"已设置 <xliff:g id="ALARM_TIME">%s</xliff:g> 的闹钟"</string>
-    <string name="timer_created" msgid="4381027137335885547">"已创建计时器"</string>
-    <string name="timer_deleted" msgid="9110322362460029392">"已删除计时器"</string>
-    <string name="invalid_timer_length" msgid="3104567893212932487">"计时器时长无效"</string>
+    <string name="timer_created" msgid="4381027137335885547">"已创建定时器"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"已删除定时器"</string>
+    <string name="invalid_timer_length" msgid="3104567893212932487">"定时器时长无效"</string>
     <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"距离 <xliff:g id="ALARM_TIME">%s</xliff:g> 的闹钟还有 24 小时以上,因此无法关闭此闹钟"</string>
     <string name="dismiss_alarm" msgid="7204593078688533541">"关闭闹钟"</string>
     <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"请选择要关闭的闹钟"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 3715eb3..2f8f3b0 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -49,7 +49,7 @@
       <item quantity="other">延遲 <xliff:g id="MINUTES">%d</xliff:g> 分鐘。</item>
       <item quantity="one">延遲 1 分鐘。</item>
     </plurals>
-    <string name="alarm_alert_snooze_until" msgid="6958013659168344550">"到 <xliff:g id="TIME">%s</xliff:g> 才重響"</string>
+    <string name="alarm_alert_snooze_until" msgid="6958013659168344550">"延後到<xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="alarm_alert_predismiss_title" msgid="5723945586913705445">"預定的鬧鐘"</string>
     <string name="missed_alarm_has_been_deleted" msgid="5295473204045979335">"您錯過的鬧鐘已刪除"</string>
     <string name="timer_notifications_less_min" msgid="5481375048976427255">"尚餘少於一分鐘"</string>
@@ -66,14 +66,14 @@
     <string name="timer_remaining_single" msgid="6782851171906765864">"尚餘"</string>
     <string name="timer_remaining_multiple" msgid="6052775962092160851">"尚餘"</string>
   <string-array name="alarm_set">
-    <item msgid="6450913786084215050">"已將鬧鐘設定在不到 1 分鐘後啟動。"</item>
-    <item msgid="6002066367368421848">"已將鬧鐘設定在 <xliff:g id="DAYS">%1$s</xliff:g>後啟動。"</item>
-    <item msgid="8824719306247973774">"已將鬧鐘設定在 <xliff:g id="HOURS">%2$s</xliff:g>後啟動。"</item>
-    <item msgid="8182406852935468862">"已將鬧鐘設定在 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g>後啟動。"</item>
-    <item msgid="2532279224777213194">"已將鬧鐘設定在 <xliff:g id="MINUTES">%3$s</xliff:g>後啟動。"</item>
-    <item msgid="5936557894247187717">"已將鬧鐘設定在 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>後啟動。"</item>
-    <item msgid="9115697840826129603">"已將鬧鐘設定在 <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>後啟動。"</item>
-    <item msgid="2332583385137381060">"已將鬧鐘設定在 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>後啟動。"</item>
+    <item msgid="6450913786084215050">"鬧鐘設定在 1 分鐘內響起。"</item>
+    <item msgid="6002066367368421848">"鬧鐘設定在 <xliff:g id="DAYS">%1$s</xliff:g>後響起。"</item>
+    <item msgid="8824719306247973774">"鬧鐘設定在 <xliff:g id="HOURS">%2$s</xliff:g>後響起。"</item>
+    <item msgid="8182406852935468862">"鬧鐘設定在 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g>後響起。"</item>
+    <item msgid="2532279224777213194">"鬧鐘設定在 <xliff:g id="MINUTES">%3$s</xliff:g>後響起。"</item>
+    <item msgid="5936557894247187717">"鬧鐘設定在 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>後響起。"</item>
+    <item msgid="9115697840826129603">"鬧鐘設定在 <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>後響起。"</item>
+    <item msgid="2332583385137381060">"鬧鐘設定在 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>後響起。"</item>
   </string-array>
     <plurals name="days" formatted="false" msgid="3706846447285206235">
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 天</item>
@@ -105,7 +105,7 @@
     <string name="analog_gadget" msgid="1670505720837152766">"指針式時鐘"</string>
     <string name="digital_gadget" msgid="2326954556720571358">"數碼時鐘"</string>
     <string name="settings" msgid="5849739030579520686">"設定"</string>
-    <string name="snooze_duration_title" msgid="1097309861110780483">"重響時間長度"</string>
+    <string name="snooze_duration_title" msgid="1097309861110780483">"延後時間長度"</string>
     <string name="crescendo_duration_title" msgid="8606408542726189528">"逐漸提升音量"</string>
     <string name="auto_silence_title" msgid="2012754009554434544">"鈴聲持續時間:"</string>
     <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
@@ -186,7 +186,7 @@
     <string name="alarms_blocked_by_dnd" msgid="6089433757505898969">"裝置已設定為完全靜音"</string>
     <string name="volume_button_setting_title" msgid="6937131248843413357">"音量按鈕"</string>
   <string-array name="volume_button_setting_entries">
-    <item msgid="7972756698723318690">"重響"</item>
+    <item msgid="7972756698723318690">"延後"</item>
     <item msgid="3450979320164769576">"關閉"</item>
     <item msgid="7085774139907653538">"控制音量"</item>
   </string-array>
@@ -373,8 +373,8 @@
     <string name="stopwatch_service_desc" msgid="9220132827343760767">"秒錶通知的處理操作。"</string>
     <string name="swn_paused" msgid="6364358842808263589">"已暫停"</string>
     <string name="description_direction_right" msgid="5709209043267548985">"向右快速滑動可關閉鬧鐘"</string>
-    <string name="description_direction_left" msgid="7448141043674998679">"向左快速滑動可重響鬧鐘"</string>
-    <string name="description_direction_both" msgid="1841309486023845685">"向左快速滑動以重響,或向右關閉"</string>
+    <string name="description_direction_left" msgid="7448141043674998679">"向左快速滑動可延後"</string>
+    <string name="description_direction_both" msgid="1841309486023845685">"向左快速滑動以延後,或向右關閉"</string>
     <string name="timer_settings" msgid="7955522143086154795">"倒數計時器"</string>
     <string name="timer_vibrate_title" msgid="7788920024785587518">"計時器震動"</string>
     <string name="timer_paused" msgid="5941160896040771462">"計時器已暫停"</string>
@@ -394,7 +394,7 @@
     <string name="world_time_behind" msgid="5395771290726167865">"遲 <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="world_hours_minutes_ahead" msgid="5132012793021696377">"早 <xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g>"</string>
     <string name="world_hours_minutes_behind" msgid="8978567362140923698">"遲 <xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g>"</string>
-    <string name="world_hours_tomorrow" msgid="2504465609269004794">"明天<xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="world_hours_tomorrow" msgid="2504465609269004794">"明天,<xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="world_hours_yesterday" msgid="4425086322610882745">"昨天<xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="world_tomorrow" msgid="7633067935455580920">"明天"</string>
     <string name="world_yesterday" msgid="5430990920477833164">"昨天"</string>
@@ -415,5 +415,5 @@
     <string name="dismiss_alarm" msgid="7204593078688533541">"關閉鬧鐘"</string>
     <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"選擇要關閉的鬧鐘"</string>
     <string name="no_firing_alarms" msgid="4986161963178722289">"現時沒有響鬧"</string>
-    <string name="alarm_is_snoozed" msgid="7044644119744928846">"<xliff:g id="ALARM_TIME">%s</xliff:g> 的鬧鐘將於 10 分鐘後重響"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"<xliff:g id="ALARM_TIME">%s</xliff:g> 的鬧鐘已延後 10 分鐘"</string>
 </resources>