am ae01ea3a: Merge "Use dp for digital clock widget clock and date/next alarm font." into ub-deskclock-army

* commit 'ae01ea3a3bfc91cd9b0f3252371a19620821e8bd':
  Use dp for digital clock widget clock and date/next alarm font.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 70f1ac3..2454a79 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,12 +17,12 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.android.deskclock"
-        android:versionCode="401" android:versionName="4.0.1">
+        android:versionCode="410" android:versionName="4.1.0">
 
     <original-package android:name="com.android.alarmclock" />
     <original-package android:name="com.android.deskclock" />
 
-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="22" />
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
@@ -30,7 +30,6 @@
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.DEVICE_POWER" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application android:label="@string/app_label"
@@ -126,6 +125,14 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
+                <action android:name="android.intent.action.DISMISS_ALARM" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SNOOZE_ALARM" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
                 <action android:name="android.intent.action.SHOW_ALARMS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -140,6 +147,65 @@
             android:exported="true">
         </activity-alias>
 
+        <activity android:name=".HandleDeskClockApiCalls"
+            android:excludeFromRecents="true"
+            android:launchMode="singleTask"
+            android:taskAffinity=""
+            android:theme="@android:style/Theme.NoDisplay"
+            android:permission="com.android.alarm.permission.SET_ALARM">
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.SHOW_CLOCK" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.ADD_CLOCK" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.DELETE_CLOCK" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.START_TIMER" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.RESET_TIMER" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.STOP_TIMER" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.SHOW_TIMERS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.DELETE_TIMER" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.SHOW_STOPWATCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.START_STOPWATCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.STOP_STOPWATCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.LAP_STOPWATCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.RESET_STOPWATCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
         <receiver android:name="AlarmInitReceiver">
             <intent-filter>
@@ -210,9 +276,14 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".AlarmSelectionActivity"
+            android:label="@string/dismiss_alarm"
+            android:theme="@android:style/Theme.Holo.Light.Dialog.NoActionBar"/>
+
         <!-- This activity is basically like the TimerFragment in DeskClock
          but only during lock screen
-         so that is only has the fired timers -->
+         so that it only has the fired timers -->
         <activity android:name="com.android.deskclock.timer.TimerAlertFullScreen"
                 android:excludeFromRecents="true"
                 android:theme="@style/TimerAlertFullScreenTheme"
@@ -233,10 +304,10 @@
                 android:exported="false">
             <intent-filter>
                 <action android:name="start_timer" />
+                <action android:name="stop_timer" />
                 <action android:name="delete_timer" />
+                <action android:name="reset_timer" />
                 <action android:name="times_up" />
-                <action android:name="timer_stop" />
-                <action android:name="timer_reset" />
                 <action android:name="timer_done" />
                 <action android:name="timer_update" />
                 <action android:name="notif_in_use_show" />
diff --git a/res/drawable-hdpi/ic_menu_revert_holo_dark.png b/res/drawable-hdpi/ic_menu_revert_holo_dark.png
deleted file mode 100644
index c067a4d..0000000
--- a/res/drawable-hdpi/ic_menu_revert_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_revert_holo_dark.png b/res/drawable-mdpi/ic_menu_revert_holo_dark.png
deleted file mode 100644
index 11250f9..0000000
--- a/res/drawable-mdpi/ic_menu_revert_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_revert_holo_dark.png b/res/drawable-xhdpi/ic_menu_revert_holo_dark.png
deleted file mode 100644
index 23f42ce..0000000
--- a/res/drawable-xhdpi/ic_menu_revert_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_revert_holo_dark.png b/res/drawable-xxhdpi/ic_menu_revert_holo_dark.png
deleted file mode 100644
index c2cdbb0..0000000
--- a/res/drawable-xxhdpi/ic_menu_revert_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_menu_revert_holo_dark.png b/res/drawable-xxxhdpi/ic_menu_revert_holo_dark.png
deleted file mode 100644
index 37e2fda..0000000
--- a/res/drawable-xxxhdpi/ic_menu_revert_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/actionable_toast_row.xml b/res/layout/actionable_toast_row.xml
index d22fcbb..dfffb3d 100644
--- a/res/layout/actionable_toast_row.xml
+++ b/res/layout/actionable_toast_row.xml
@@ -16,16 +16,6 @@
   -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <ImageView
-        android:id="@+id/description_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical"
-        android:paddingLeft="16dip"
-        android:paddingStart="16dip"
-        android:src="@drawable/ic_menu_revert_holo_dark"
-        android:contentDescription="@string/alarm_undo" />
-
     <TextView
         android:id="@+id/description_text"
         android:layout_width="0dip"
@@ -46,30 +36,9 @@
         android:layout_height="match_parent"
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true" >
-
-        <View
-            android:id="@+id/separator"
-            android:layout_width="1dip"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="10dip"
-            android:layout_marginRight="12dip"
-            android:layout_marginEnd="12dip"
-            android:layout_marginTop="10dip"
-            android:background="#aaaaaa" />
-
-        <ImageView
-            android:id="@+id/action_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:layout_marginRight="4dip"
-            android:layout_marginEnd="4dip"
-            android:src="@drawable/ic_menu_revert_holo_dark"
-            android:contentDescription="@null" />
-
         <TextView
             android:id="@+id/action_text"
-            style="@style/body"
+            style="@style/undo_toast"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginLeft="4dip"
diff --git a/res/layout/alarm_row.xml b/res/layout/alarm_row.xml
new file mode 100644
index 0000000..5697e9e
--- /dev/null
+++ b/res/layout/alarm_row.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:dc="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/alarm_item"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="@dimen/alarm_label_padding"
+    android:gravity="top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.android.deskclock.widget.TextTime
+            android:id="@+id/digital_clock"
+            android:layout_marginTop="@dimen/alarm_clock_vertical_margin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/black"
+            android:textSize="@dimen/label_font_size"
+            android:textStyle="bold"
+            dc:format12Hour="@string/alarm_time_12_hours_format"
+            dc:format24Hour="@string/clock_24_hours_format" />
+
+        <TextView
+            android:id="@+id/daysOfWeek"
+            tools:text="M, T, W"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textSize="@dimen/label_font_size"
+            android:textColor="@color/black"
+            android:layout_marginTop="@dimen/alarm_clock_vertical_margin"
+            android:layout_marginStart="@dimen/alarm_clock_vertical_margin" />
+    </LinearLayout>
+
+    <com.android.deskclock.widget.EllipsizeLayout
+        android:id="@+id/summary"
+        android:layout_marginTop="@dimen/label_margin_big"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="bottom"
+        android:layout_gravity="end"
+        android:orientation="vertical"
+        android:layout_marginBottom="@dimen/alarm_clock_vertical_margin">
+
+        <TextView
+            android:id="@+id/label"
+            tools:text="Pick up kids"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="none"
+            android:singleLine="true"
+            android:textSize="@dimen/label_font_size"
+            android:textColor="@color/black_54p" />
+    </com.android.deskclock.widget.EllipsizeLayout>
+</LinearLayout>
diff --git a/res/layout/city_list_header.xml b/res/layout/city_list_header.xml
index b0658a1..92120d3 100644
--- a/res/layout/city_list_header.xml
+++ b/res/layout/city_list_header.xml
@@ -17,12 +17,13 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/header"
     android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:minHeight="32dip"
     android:layout_marginTop="24dip"
     android:layout_marginBottom="8dip"
     android:paddingStart="20dip"
-    android:gravity="center"
+    android:gravity="start"
+    android:textAlignment="viewStart"
     android:textColor="@color/clock_white"
     android:textSize="20sp"
     android:text="@string/selected_cities_label" />
diff --git a/res/layout/desk_clock_saver.xml b/res/layout/desk_clock_saver.xml
index 1e271a9..8d173d7 100644
--- a/res/layout/desk_clock_saver.xml
+++ b/res/layout/desk_clock_saver.xml
@@ -48,7 +48,6 @@
             android:layout_gravity="center"
             android:layout_marginBottom="@dimen/bottom_text_spacing_digital"
             style="@style/big_thin"
-            android:textSize="@dimen/digital_screensaver_clock_text_size"
             android:textColor="@color/clock_white" />
 
         <com.android.deskclock.AnalogClock
diff --git a/res/layout/label_dialog.xml b/res/layout/label_dialog.xml
deleted file mode 100644
index 4095950..0000000
--- a/res/layout/label_dialog.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/title"
-        style="?android:attr/windowTitleStyle"
-        android:layout_marginTop="24dip"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="4dip"
-        android:text="@string/label"
-        android:textColor="@color/white" />
-
-    <EditText
-        android:id="@+id/labelBox"
-        style="@style/labelEditTextStyle"
-        android:layout_marginTop="16dip"
-        android:layout_marginBottom="24dip"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_below="@id/title" />
-
-    <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:layout_marginBottom="16dip"
-        android:layout_below="@id/labelBox"
-        android:gravity="end">
-
-        <Button
-            android:id="@+id/cancelButton"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:text="@string/time_picker_cancel"
-            android:textAllCaps="true"
-            android:textColor="?attr/colorAccent"
-            android:textSize="@dimen/dialog_button_font_size" />
-
-        <Button
-            android:id="@+id/setButton"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:text="@string/time_picker_set"
-            android:textAllCaps="true"
-            android:textColor="?attr/colorAccent"
-            android:textSize="@dimen/dialog_button_font_size" />
-
-    </LinearLayout>
-</RelativeLayout>
diff --git a/res/layout/selection_layout.xml b/res/layout/selection_layout.xml
new file mode 100644
index 0000000..0da03d6
--- /dev/null
+++ b/res/layout/selection_layout.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/alarm_picker_dialog_horizontal_margin"
+    android:paddingRight="@dimen/alarm_picker_dialog_horizontal_margin"
+    android:paddingTop="@dimen/alarm_picker_dialog_vertical_margin">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/dismiss_alarm"
+        android:textColor="@color/black"
+        android:textSize="@dimen/header_font_size"
+        android:layout_marginBottom="@dimen/alarm_picker_margin_bottom"/>
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:dividerHeight="0dp"
+        android:divider="@null"/>
+
+    <Button
+        android:id="@+id/cancel_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/time_picker_cancel"
+        android:clickable="true"
+        android:gravity="end"
+        android:background="@android:color/transparent"
+        android:textColor="@android:color/holo_blue_light"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/snooze_length_picker.xml b/res/layout/snooze_length_picker.xml
index 4f3f779..e94e27c 100644
--- a/res/layout/snooze_length_picker.xml
+++ b/res/layout/snooze_length_picker.xml
@@ -22,7 +22,8 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent" >
 
-    <NumberPicker android:id="@+id/minutes_picker"
+    <com.android.deskclock.NumberPickerCompat
+        android:id="@+id/minutes_picker"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:focusable="true"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 4de017d..20d0ed6 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Alarm gestel vir <xliff:g id="HOURS">%2$s</xliff:g> en <xliff:g id="MINUTES">%3$s</xliff:g> van nou af."</item>
     <item msgid="2332583385137381060">"Alarm gestel vir <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g>en <xliff:g id="MINUTES">%3$s</xliff:g> van nou af."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 dag"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> dae"</string>
-    <string name="hour" msgid="2546819039651509323">"1 uur"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> uur"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minuut"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minute"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dae</item>
+      <item quantity="one">1 dag</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> uur</item>
+      <item quantity="one">1 uur</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="one">1 minuut</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Elke dag"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Kies \'n horlosie"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Instellings"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Sluimer-duurte"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
       <item quantity="one">1 minuut</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minuut</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Stilte ná"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minute"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minute</item>
+      <item quantity="one">1 minuut</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Nooit"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minuut"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"My tyd is <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Rondtetye:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Rondte <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> uur</item>
       <item quantity="one">1 uur</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Vou wekker uit"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Vou wekker in"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"ontdoen"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Wekker uitgevee."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Wekker uitgevee"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Volgende wekker: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE., k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Ongeldige tyd <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Geen wekker om <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g> nie"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Geen wekkers is gestel nie"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Stophorlosie loop reeds"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Stophorlosie loop nie"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Stophorlosiemodus is verander"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Geen wekker is vir hierdie tyd gestel nie"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"<xliff:g id="ALARM_TIME">%s</xliff:g>-wekker is toegemaak"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Geen afteller is gestel nie"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Afteller is uitgevee"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Afteller loop reeds"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Kan nie jou versoek voltooi nie; veelvuldige aftellers is beskikbaar"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Afteller is begin"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Afteller is teruggestel"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Afteller kan nie teruggestel word nie, want dit loop nog. Stop afteller om dit terug te stel."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Afteller is reeds gestop"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Geen stad is gekies nie"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Die stad wat jy gespesifiseer het, is nie beskikbaar nie"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Daardie stad is reeds bygevoeg"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> is bygevoeg"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> is uitgevee"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"<xliff:g id="ALARM_TIME">%s</xliff:g>-wekker kan nog nie toegemaak word nie; nog meer as 24 uur ver"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Maak alarm toe"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Kies watter wekker om toe te maak"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Geen wekkers wat lui nie"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"<xliff:g id="ALARM_TIME">%s</xliff:g>-wekker is vir 10 minute gesluimer"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index eeefe7d..c8ab662 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> ቀን"</string>
-    <string name="hour" msgid="2546819039651509323">"1 ሰዓት"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> ሰዓቶች"</string>
-    <string name="minute" msgid="2486157997434653710">"1"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> ደቂቃዎች"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ቀኖች</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ቀኖች</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ሰዓቶች</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ሰዓቶች</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ደቂቃዎች</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ደቂቃዎች</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"በየቀኑ"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"ሰዓት ምረጥ"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"ቅንብሮች"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"የአሸልብ ርዝመት"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ደቂቃዎች</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ደቂቃዎች</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ደቂቃዎች</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ደቂቃዎች</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">ደቂቃዎች</item>
       <item quantity="other">ደቂቃዎች</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"ጸጥታ ከዚህ በኋላ፦"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> ደቂቃዎች"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> ደቂቃዎች</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> ደቂቃዎች</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"በጭራሽ"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 ደቂቃ"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ሰዓቶች</item>
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ሰዓቶች</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"ማንቂያ ዘርጋ"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"ማንቂያ ሰብስብ"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"ቀልብስ"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"ማንቂያ ተሰርዟል።"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"ማንቂያ ተሰርዟል"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"ቀጣዩ ማንቂያ፦ <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"ሰ:ደደ"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE፣ ሰ:ደደ a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE፣ k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"ልክ ያልሆነ ጊዜ <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g> ላይ ማንቂያ ደወል የለም"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"ምንም መርሐግብር የተያዘላቸው ማንቂያ ደወሎች የሉም"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"የሩጫ ሰዓት አስቀድሞ እየሰራ ነው"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"የሩጫ ሰዓት እየሰራ አይደለም"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"የሩጫ ሰዓት ሁነታ ተለውጧል"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"ምንም ሰዓት ቆጣሪ አልተዘጋጀም"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"ሰዓት ቆጣሪ ተሰርዟል"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"ሰዓት ቆጣሪ አስቀድሞ እየሰራ ነው"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"ጥያቄዎን ማጠናቀቅ አልተቻለም፣ በርካታ ሰዓት ቆጣሪዎች ይገኛሉ"</string>
+    <string name="timer_started" msgid="6715582052946641641">"ሰዓት ቆጣሪ ተጀምሯል"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"ሰዓት ቆጣሪ ዳግም ተዘጋጅቷል"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"ሰዓት ቆጣሪ አሁንም እየሰራ ስለሆነ ዳግም ሊዘጋጅ አይችልም። ዳግም ለማዘጋጀት ሰዓት ቆጣሪን ያስቁሙት።"</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"ሰዓት ቆጣሪ አስቀድሞ ቆሟል"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"ምንም ከተማ አልተመረጠም"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"የጠቀሱት ከተማ አይገኝም"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"ይሄ ከተማ አስቀድሞ ታክሏል"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> ታክሏል"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> ተሰርዟል"</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>
+    <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>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 2299ce3..5be83cd 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -81,12 +81,30 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"يوم واحد"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> يوم"</string>
-    <string name="hour" msgid="2546819039651509323">"ساعة واحدة"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> ساعة"</string>
-    <string name="minute" msgid="2486157997434653710">"دقيقة واحدة"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> دقيقة"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="zero"><xliff:g id="NUMBER">%s</xliff:g> من الأيام</item>
+      <item quantity="two">يومان (<xliff:g id="NUMBER">%s</xliff:g>)</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> أيام</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> يومًا</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> من الأيام</item>
+      <item quantity="one">يوم واحد</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="zero"><xliff:g id="NUMBER">%s</xliff:g> من الساعات</item>
+      <item quantity="two">ساعتان (<xliff:g id="NUMBER">%s</xliff:g>)</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> ساعات</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> ساعة</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> من الساعات</item>
+      <item quantity="one">ساعة واحدة</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="zero"><xliff:g id="NUMBER">%s</xliff:g> من الدقائق</item>
+      <item quantity="two">دقيقتان (<xliff:g id="NUMBER">%s</xliff:g>)</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> دقائق</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> دقيقة</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> من الدقائق</item>
+      <item quantity="one">دقيقة واحدة</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"كل يوم"</string>
     <string name="day_concat" msgid="971998564991636532">"، "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"اختيار ساعة"</string>
@@ -95,11 +113,11 @@
     <string name="settings" msgid="5849739030579520686">"الإعدادات"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"طول مدة الغفوة"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="zero"><xliff:g id="NUMBER">%d</xliff:g> minutes</item>
-      <item quantity="two">دقيقتان (<xliff:g id="NUMBER">%d</xliff:g>)</item>
-      <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> دقائق</item>
-      <item quantity="many"><xliff:g id="NUMBER">%d</xliff:g> دقيقة</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> من الدقائق</item>
+      <item quantity="zero"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
+      <item quantity="two">دقيقتان (<xliff:g id="NUMBER">%s</xliff:g>)</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> دقائق</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> دقيقة</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> من الدقائق</item>
       <item quantity="one">دقيقة واحدة</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -111,7 +129,14 @@
       <item quantity="one">دقيقة واحدة</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"صامت بعد"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> دقيقة"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="zero"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> من الدقائق</item>
+      <item quantity="two">دقيقتان (<xliff:g id="FORMATTED_NUMBER">%s</xliff:g>)</item>
+      <item quantity="few"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> دقائق</item>
+      <item quantity="many"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> دقيقة</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> من الدقائق</item>
+      <item quantity="one">دقيقة واحدة</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"أبدًا"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"دقيقة واحدة"</item>
@@ -188,6 +213,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"العدد <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"العدد <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="zero"><xliff:g id="NUMBER">%d</xliff:g> hours</item>
       <item quantity="two">ساعتان (<xliff:g id="NUMBER">%d</xliff:g>)</item>
@@ -359,7 +388,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"توسيع المنبه"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"تصغير المنبه"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"تراجع"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"تم حذف المنبه."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"تم حذف المنبه."</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"التنبيه التالي: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -383,4 +412,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"ك:دد"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"‏EEE، س:دد ص"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"‏EEE، ‏س:دد"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"وقت غير صالح <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"لم يتم تعيين منبه للوقت <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"لم يتم تعيين أي منبه"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"ساعة الإيقاف قيد التشغيل حاليًا"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"ساعة الإيقاف ليست قيد التشغيل"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"تم تغيير وضع ساعة الإيقاف"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"لم يتم تعيين أي موَقِّت"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"تم حذف الموقِّت"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"الموقِّت قيد التشغيل حاليًا"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"تعذر إكمال طلبك، هناك عدة مؤقتات متاحة"</string>
+    <string name="timer_started" msgid="6715582052946641641">"تم بدء الموقّت"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"تمت إعادة تعيين الموقِّت"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"لا يمكن إعادة تعيين الموقِّت لأنه لا يزال قيد التشغيل. عليك إيقاف الموقِّت لإعادة تعيينه."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"تم إيقاف الموقِّت من قبل"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"لم يتم تحديد أية مدينة"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"المدينة التي حددتها غير متاحة"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"تمت إضافة هذه المدينة من قبل"</string>
+    <string name="city_added" msgid="1335509457349179514">"تمت إضافة <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"تم حذف <xliff:g id="CITY_NAME">%s</xliff:g>"</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>
+    <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>
 </resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 9f7c0bc..4d1f326 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Siqnalı <xliff:g id="HOURS">%2$s</xliff:g> və <xliff:g id="MINUTES">%3$s</xliff:g> sonraya qur."</item>
     <item msgid="2332583385137381060">"Siqnalı <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> və <xliff:g id="MINUTES">%3$s</xliff:g> sonraya qur."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 gün"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> gün"</string>
-    <string name="hour" msgid="2546819039651509323">"1 saat"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> saat"</string>
-    <string name="minute" msgid="2486157997434653710">"1 dəqiqə"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> dəqiqə"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> gün</item>
+      <item quantity="one">1 gün</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> saat</item>
+      <item quantity="one">1 saat</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dəqiqə</item>
+      <item quantity="one">1 dəqiqə</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Hər gün"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Bir saat seçin"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Parametrlər"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Ertələmə uzunluğu"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> dəqiqə</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dəqiqə</item>
       <item quantity="one">1 dəqiqə</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">dəqiqə</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Sonra susdur"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> dəqiqə"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> dəqiqə</item>
+      <item quantity="one">1 dəqiqə</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Heç vaxt"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 dəqiqə"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Mənim vaxtım <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Dövrə sayısı:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Dövrə <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> saat</item>
       <item quantity="one">1 saat</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Siqnalı genişlət"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Siqnalı sıradan çıxar"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"geri gətir"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Siqnal silindi."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Siqnal silindi."</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Sonrakı Siqnal: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Yanlış vaxt <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g> vaxtına siqnal yoxdur"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Planlaşdırılmış siqnal yoxdur"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Saniyəölçən artıq işə salınıb"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Saniyəölçən işə salınmayıb"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Saniyəölçənin rejimi dəyişdi"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Bu vaxt üçün heç bir siqnal təyin olunmayıb"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"<xliff:g id="ALARM_TIME">%s</xliff:g> siqnal deaktiv edildi"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Heç bir vaxtölçən ayarlanmayıb"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Vaxtölçən silindi"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Vaxtölçən artıq işə salınıb"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Sorğunuzu tamamlamaq olmur, bir neçə vaxtölçən aktivdir"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Vaxtölçən başladı"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Vaxtölçən sıfırlandı"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Vaxtölçən sıfırlana bilməz cünki, hələ də çalışmaqdadır. Sıfırlamak üçün vaxtölçəni dayandırın."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Vaxtölçən artıq dayandırılıb"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Heç bir şəhər seçilməyib"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Təyin etdiyiniz şəhər əlçatan deyil"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Bu şəhər artıq əlavə edilib"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> əlavə edildi"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> silindi"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"<xliff:g id="ALARM_TIME">%s</xliff:g> siqnalı hələ deaktiv edilə bilməz, 24 saatdan artıq vaxt qalıb."</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Zəngli saatı ləğv edin"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Kənarlaşdırmaq üçün siqnal seçin"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Heç bir yanğın siqnalı yoxdur"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"<xliff:g id="ALARM_TIME">%s</xliff:g> siqnal 10 dəqiqəlik ertələndi"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index f2a65da..99f2741 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 ден"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> дни"</string>
-    <string name="hour" msgid="2546819039651509323">"1 час"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> часа"</string>
-    <string name="minute" msgid="2486157997434653710">"1 мин"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> мин"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> дни</item>
+      <item quantity="one">1 ден</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> часа</item>
+      <item quantity="one">1 час</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минути</item>
+      <item quantity="one">1 минута</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"всеки ден"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Избор на часовник"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Настройки"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Продължителност на отлагането"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> минути</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минути</item>
       <item quantity="one">1 минута</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one"> минута</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Заглушаване след"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> минути"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> минути</item>
+      <item quantity="one">1 минута</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Никога"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 минута"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"№ <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"№ <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> часа</item>
       <item quantity="one">1 час</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Разгъване на будилника"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Свиване на будилника"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"отмяна"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Изтрито"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Будилникът е изтрит"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Следващ будилник: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Няма насрочени будилници"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Хронометърът вече работи"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Хронометърът не работи"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Режимът на хронометъра е променен"</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Будилникът за <xliff:g id="ALARM_TIME">%s</xliff:g> е отхвърлен"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Няма зададен таймер"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Таймерът е изтрит"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Таймерът вече работи"</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"Таймерът е стартиран"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Таймерът е нулиран"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Не можете да нулирате таймера, защото още работи. Трябва първо да го спрете."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Таймерът вече е спрян"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Няма избран град"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Посоченият от вас град не е налице"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Този град вече е добавен"</string>
+    <string name="city_added" msgid="1335509457349179514">"Добавихте <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Изтрихте <xliff:g id="CITY_NAME">%s</xliff:g>"</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>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <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>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index a9a8b27..e0e49f1 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 দিন"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> দিন"</string>
-    <string name="hour" msgid="2546819039651509323">"1 ঘন্টা"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> ঘন্টা"</string>
-    <string name="minute" msgid="2486157997434653710">"1 মিনিট"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> মিনিট"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> দিন</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> দিন</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ঘণ্টা</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ঘণ্টা</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> মিনিট</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> মিনিট</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"প্রতিদিন"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"একটি ঘড়ি পছন্দ করুন"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"সেটিংস"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"স্নুজ মেয়াদ"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> মিনিট</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> মিনিট</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> মিনিট</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> মিনিট</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">মিনিট</item>
       <item quantity="other">মিনিট</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"এর পরে নীরব করুন"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> মিনিট"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> মিনিট</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> মিনিট</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"কখনই নয়"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"১ মিনিট"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ঘন্টা</item>
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ঘন্টা</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"অ্যালার্ম প্রসারিত করুন"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"অ্যালার্ম সঙ্কুচিত করুন"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"পূর্বাবস্থায় ফিরুন"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"অ্যালার্ম মুছে ফেলা হয়েছে।"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"অ্যালার্ম মুছে ফেলা হয়েছে"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"পরবর্তী অ্যালার্ম: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"অবৈধ সময় <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g> -এ কোনো অ্যালার্ম নেই"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"কোনো সময়সূচী নেই"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"স্টপওয়াচ ইতিমধ্যেই চলছে"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"স্টপওয়াচ চলছে না"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"স্টপওয়াচ মোড পরিবর্তিত হয়েছে"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"কোনো টাইমার সেট করা নেই"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"টাইমার মুছে ফেলা হয়েছে"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"টাইমার ইতিমধ্যেই চলছে"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"আপনার অনুরোধ সম্পূর্ণ করা যায়নি, একাধিক টাইমার উপলব্ধ রয়েছে"</string>
+    <string name="timer_started" msgid="6715582052946641641">"টাইমার শুরু হয়েছে"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"টাইমার পুনরায় সেট করা হয়েছে"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"টাইমার পুনরায় সেট করা যাবে না কারণ এটি এখনও চলছে৷ পুনরায় সেট করতে টাইমার বন্ধ করুন৷"</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"টাইমার ইতিমধ্যেই থেমে গেছে"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"কোনো শহর নির্বাচিত নেই"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"আপনার নির্দিষ্ট করা শহরটি উপলব্ধ নেই"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"এই শহরটি ইতিমধ্যেই যোগ করা হয়েছে"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> যোগ করা হয়েছে"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> মুছে ফেলা হয়েছে"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"<xliff:g id="ALARM_TIME">%s</xliff:g> অ্যালার্ম এখনো খারিজ করা যাবে না, এখনো পর্যন্ত প্রায় ২৪ ঘন্টা দূরে রয়েছে"</string>
+    <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> অ্যালার্ম ১০ মিনিটে মনে করিয়ে দেওয়ার জন্য চিহ্নিত করা হয়েছে"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 67c489c..81c83a5 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"L\'alarma sonarà d\'aquí a <xliff:g id="HOURS">%2$s</xliff:g> i <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
     <item msgid="2332583385137381060">"L\'alarma sonarà d\'aquí a <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> i <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 dia"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> dies"</string>
-    <string name="hour" msgid="2546819039651509323">"1 hora"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> hores"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minut"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minuts"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dies</item>
+      <item quantity="one">1 dia</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> hores</item>
+      <item quantity="one">1 hora</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuts</item>
+      <item quantity="one">1 minut</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Cada dia"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Tria un rellotge"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Configuració"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Repeteix alarma després de"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minuts</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuts</item>
       <item quantity="one">1 minut</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minut</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Silencia després de"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minuts"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minuts</item>
+      <item quantity="one">1 minut</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Mai"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minut"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"La meva hora: <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Durada de les voltes:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Volta <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"Núm. <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"Núm. <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> hores</item>
       <item quantity="one">1 hora</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Amplia l\'alarma"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Redueix l\'alarma"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"desfés"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"S\'ha suprimit l\'alarma."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarma suprimida"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Propera alarma: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Hora no vàlida <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"No hi ha cap alarma a les <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"No s\'ha programat cap alarma"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"El cronòmetre ja està en marxa"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"El cronòmetre no s\'ha posat en marxa"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"S\'ha canviat el mode de cronòmetre"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"No hi ha cap alarma programada per a aquesta hora"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"L\'alarma <xliff:g id="ALARM_TIME">%s</xliff:g> s\'ha ignorat"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"No s\'ha definit cap temporitzador"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"El temporitzador s\'ha suprimit"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"El temporitzador ja està en marxa"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"No es pot completar la sol·licitud. Hi ha diversos temporitzadors disponibles"</string>
+    <string name="timer_started" msgid="6715582052946641641">"El temporitzador s\'ha iniciat"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"El temporitzador s\'ha restablert"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"El temporitzador no es pot restablir perquè encara està en marxa. Atura\'l per restablir-lo."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"El temporitzador ja s\'ha aturat"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"No s\'ha seleccionat cap ciutat"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"La ciutat que has especificat no està disponible"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Aquesta ciutat ja s\'ha afegit"</string>
+    <string name="city_added" msgid="1335509457349179514">"S\'ha afegit <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"S\'ha suprimit <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"L\'alarma <xliff:g id="ALARM_TIME">%s</xliff:g> encara no es pot ignorar, ja que hi falten més de 24 hores"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Ignora l\'alarma"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Tria quina alarma vols ignorar"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"No hi ha cap alarma activa"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"L\'alarma <xliff:g id="ALARM_TIME">%s</xliff:g> s\'ha posposat deu minuts"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e1b1c28..032f3bc 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -77,12 +77,24 @@
     <item msgid="9115697840826129603">"Budík se spustí za <xliff:g id="HOURS">%2$s</xliff:g> a <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
     <item msgid="2332583385137381060">"Budík se spustí za <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> a <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 den"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> d."</string>
-    <string name="hour" msgid="2546819039651509323">"1 hodina"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> h"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minuta"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> min"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> dny</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> dne</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dnů</item>
+      <item quantity="one">1 den</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> hodiny</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> hodiny</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> hodin</item>
+      <item quantity="one">1 hodina</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minuty</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> minuty</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minut</item>
+      <item quantity="one">1 minuta</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Každý den"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Vyberte hodiny"</string>
@@ -91,9 +103,9 @@
     <string name="settings" msgid="5849739030579520686">"Nastavení"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Délka odložení zvonění"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> minuty</item>
-      <item quantity="many"><xliff:g id="NUMBER">%d</xliff:g> minuty</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minut</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minuty</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> minuty</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minut</item>
       <item quantity="one">1 minuta</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -103,7 +115,12 @@
       <item quantity="one">1 minuta</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Ztišit po"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> min"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="few"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minuty</item>
+      <item quantity="many"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minuty</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minut</item>
+      <item quantity="one">1 minuta</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Nikdy"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minutě"</item>
@@ -180,6 +197,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Můj čas je <xliff:g id="TIME">%s</xliff:g>."</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Časy etap:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. úsek"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"Č. <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"Č. <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> hodiny</item>
       <item quantity="many"><xliff:g id="NUMBER">%d</xliff:g> hodiny</item>
@@ -345,7 +366,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Rozbalit budík"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Sbalit budík"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"vrátit zpět"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Budík byl smazán"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Budík byl smazán"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Další budík: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -367,4 +388,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Žádné plánované budíky"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Stopky již běží"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Stopky neběží"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Režim stopek se změnil"</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Budík v čase <xliff:g id="ALARM_TIME">%s</xliff:g> byl zrušen"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Není nastaven žádný časovač"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Časovač byl smazán"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Časovač již běží"</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"Časovač byl spuštěn"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Časovač byl resetován"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Časovač nelze resetovat, protože stále běží. Chcete-li jej resetovat, nejprve jej zastavte."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Časovač již byl zastaven"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Není vybráno žádné město"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Zadané město není k dispozici"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Toto město již bylo přidáno"</string>
+    <string name="city_added" msgid="1335509457349179514">"Město <xliff:g id="CITY_NAME">%s</xliff:g> bylo přidáno"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Město <xliff:g id="CITY_NAME">%s</xliff:g> bylo smazáno"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Budík v čase <xliff:g id="ALARM_TIME">%s</xliff:g> zatím nelze zrušit, protože do jeho aktivování zbývá více než 24 hodin"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Zrušit budík"</string>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Žádné zvonící budíky"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Budík v čase <xliff:g id="ALARM_TIME">%s</xliff:g> byl odložen o 10 minut"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 115b5cb..98f2a4e 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -73,12 +73,18 @@
     <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="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>
-    <string name="day" msgid="7984755014526510295">"1 dag"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> dage"</string>
-    <string name="hour" msgid="2546819039651509323">"1 time"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> timer"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minut"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutter"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> dage</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dage</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> timer</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> timer</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minutter</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutter</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Hver dag"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Vælg et ur"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"Indstillinger"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Udsættelsens varighed"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> minutter</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutter</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minutter</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutter</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">minutter</item>
       <item quantity="other">minutter</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Slukkes efter"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutter</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutter</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Aldrig"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minut"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> timer</item>
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> timer</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Udvid alarm"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Skjul alarm"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"fortryd"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarmen blev slettet."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarmen blev slettet"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/<xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Næste alarm: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k.mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, t.mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Ugyldigt klokkeslæt <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Der er ingen alarm kl. <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Der er ikke nogen planlagte alarmer"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Stopuret kører allerede"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Stopuret kører ikke"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Stopurstilstanden blev ændret"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Der er ikke angivet nogen alarm til dette tidspunkt"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Alarmen kl. <xliff:g id="ALARM_TIME">%s</xliff:g> er afvist"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Der er ikke angivet nogen timer"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Timeren blev slettet"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Timeren kører allerede"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Din anmodning kunne ikke gennemføres. Der er flere relevante timere."</string>
+    <string name="timer_started" msgid="6715582052946641641">"Timeren blev igangsat"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Timeren blev nulstillet"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Timeren kan ikke nulstilles, da den stadig kører. Stop timeren for at nulstille den."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Timeren er allerede stoppet"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Der er ikke valgt nogen by"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Den by, du har angivet, er ikke tilgængelig"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Byen er allerede blevet tilføjet"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> blev tilføjet"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> blev slettet"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Alarmen for kl. <xliff:g id="ALARM_TIME">%s</xliff:g> kan endnu ikke afvises. Der er stadig mere end 24 timer til, at den aktiveres"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Afvis alarm"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Vælg, hvilken alarm der skal afvises"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Der er ikke valgt nogen røglarmer"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Alarmen kl. <xliff:g id="ALARM_TIME">%s</xliff:g> er udsat i 10 minutter"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f7f3e6f..d0a56b5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Der Wecker klingelt in <xliff:g id="HOURS">%2$s</xliff:g> und <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
     <item msgid="2332583385137381060">"Der Wecker klingelt in <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> und <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 Tag"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> Tagen"</string>
-    <string name="hour" msgid="2546819039651509323">"1 Stunde"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> Stunden"</string>
-    <string name="minute" msgid="2486157997434653710">"1 Minute"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> Minuten"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> Tage</item>
+      <item quantity="one">1 Tag</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> Stunden</item>
+      <item quantity="one">1 Stunde</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> Minuten</item>
+      <item quantity="one">1 Minute</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Täglich"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Uhr wählen"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Einstellungen"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Dauer der Schlummerfunktion"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> Minuten</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> Minuten</item>
       <item quantity="one">1 Minute</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">Minute</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Stummschalten nach"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> Minuten"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> Minuten</item>
+      <item quantity="one">1 Minute</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Nie"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 Minute"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Meine Zeit: <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Rundenzeiten:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. Runde"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"Nr. <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"Nr. <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> Stunden</item>
       <item quantity="one">1 Stunde</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Wecker maximieren"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Wecker minimieren"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"Rückgängig"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Weckzeit gelöscht"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Weckzeit gelöscht"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/<xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Nächste Weckzeit: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Ungültige Zeit <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Kein Weckruf um <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g> vorhanden"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Keine eingerichteten Weckrufe"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Die Stoppuhr wird bereits ausgeführt."</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Die Stoppuhr wird nicht ausgeführt."</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Der Stoppuhrmodus wurde geändert."</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Für diese Zeit ist kein Weckruf eingerichtet."</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Weckruf um <xliff:g id="ALARM_TIME">%s</xliff:g> wurde verworfen."</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Kein Timer eingerichtet"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Timer gelöscht"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Der Timer wird bereits ausgeführt."</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Anfrage kann nicht ausgeführt werden. Mehrere Timer verfügbar."</string>
+    <string name="timer_started" msgid="6715582052946641641">"Timer gestartet"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Timer zurückgesetzt"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Der Timer kann nicht zurückgesetzt werden, da er noch ausgeführt wird. Halten Sie den Timer an, um ihn zurückzusetzen."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Der Timer wurde bereits beendet."</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Keine Stadt ausgewählt"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Die angegebene Stadt ist nicht verfügbar."</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Diese Stadt wurde bereits hinzugefügt."</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> wurde hinzugefügt."</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> wurde gelöscht."</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Der Weckruf um <xliff:g id="ALARM_TIME">%s</xliff:g> kann noch nicht verworfen werden, da bis zum Auslösen noch mehr als 24 Stunden fehlen."</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Alarm schließen"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Zu schließenden Alarm auswählen"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Keine aktiven Weckrufe"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Für den Weckruf um <xliff:g id="ALARM_TIME">%s</xliff:g> wurde die Schlummerfunktion aktiviert. Der Wecker klingelt in 10 Minuten erneut."</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f5f921d..057f216 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 ημέρα"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> ημέρες"</string>
-    <string name="hour" msgid="2546819039651509323">"1 ώρα"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> ώρες"</string>
-    <string name="minute" msgid="2486157997434653710">"1 λεπτό"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> λεπτά"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ημέρες</item>
+      <item quantity="one">1 ημέρα</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ώρες</item>
+      <item quantity="one">1 ώρα</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> λεπτά</item>
+      <item quantity="one">1 λεπτό</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Κάθε ημέρα"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Επιλέξτε ένα ρολόι"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Ρυθμίσεις"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Διάρκεια αναβολής"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> λεπτά</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> λεπτά</item>
       <item quantity="one">1 λεπτό</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">λεπτό</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Σίγαση μετά"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> λεπτά"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> λεπτά</item>
+      <item quantity="one">1 λεπτό</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Ποτέ"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 λεπτό"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ώρες</item>
       <item quantity="one">1 ώρα</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Ανάπτυξη ξυπνητηριού"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Σύμπτυξη ξυπνητηριού"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"αναίρεση"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Το ξυπν. διαγράφ."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Το ξυπνητήρι έχει διαγραφεί"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Επόμενο ξυπνητήρι: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"ω:λλ"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"ΗΗΗ, ω:λλ π.μ."</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"ΗΗΗ, ω: λλ"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Μη έγκυρη ώρα <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Δεν υπάρχει ξυπνητήρι στις <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Δεν υπάρχουν προγραμματισμένα ξυπνητήρια"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Το χρονόμετρο λειτουργεί ήδη"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Το χρονόμετρο δεν λειτουργεί"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Η λειτουργία χρονομέτρου άλλαξε"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Δεν ορίστηκε αντίστροφη μέτρηση"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Η αντίστροφη μέτρηση διαγράφηκε"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Η αντίστροφη μέτρηση ξεκίνησε ήδη"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Δεν είναι δυνατή η ολοκλήρωση του αιτήματος, διατίθενται πολλές αντίστροφες μετρήσεις"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Η αντίστροφη μέτρηση ξεκίνησε"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Επαναφορά αντίστροφης μέτρησης"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Δεν είναι δυνατή η επαναφορά της αντίστροφης μέτρησης, επειδή εξακολουθεί να λειτουργεί. Διακόψτε την αντίστροφη μέτρηση για να την επαναφέρετε."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Η αντίστροφη μέτρηση διακόπηκε ήδη"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Δεν επιλέχτηκε πόλη"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Η πόλη που καθορίσατε δεν είναι διαθέσιμη"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Αυτή η πόλη προστέθηκε ήδη"</string>
+    <string name="city_added" msgid="1335509457349179514">"Προστέθηκε η πόλη <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Διαγράφηκε η πόλη <xliff:g id="CITY_NAME">%s</xliff:g>"</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>
+    <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>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 368bba4..aa720d1 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Alarm set for <xliff:g id="HOURS">%2$s</xliff:g> and <xliff:g id="MINUTES">%3$s</xliff:g> from now."</item>
     <item msgid="2332583385137381060">"Alarm set for <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> and <xliff:g id="MINUTES">%3$s</xliff:g> from now."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 day"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> days"</string>
-    <string name="hour" msgid="2546819039651509323">"1 hour"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> hours"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minute"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutes"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> days</item>
+      <item quantity="one">1 day</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> hours</item>
+      <item quantity="one">1 hour</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
+      <item quantity="one">1 minute</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Every day"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Choose a clock"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Settings"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Snooze length"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutes</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
       <item quantity="one">1 minute</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minute</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Silence after"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutes"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutes</item>
+      <item quantity="one">1 minute</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Never"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minute"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"My time is <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Lap times:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Lap <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> hours</item>
       <item quantity="one">1 hour</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Expand alarm"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Collapse alarm"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"Undo"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarm deleted."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarm deleted"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Next alarm: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h.mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Invalid time <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"No alarm at <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"No scheduled alarms"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Stopwatch is already running"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Stopwatch isn\'t running"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Stopwatch mode changed"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"No alarm scheduled for this time"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"<xliff:g id="ALARM_TIME">%s</xliff:g> alarm dismissed"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"No timer set"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Timer deleted"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Timer already running"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Unable to complete your request, multiple timers available"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Timer started"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Timer reset"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Timer can\'t be reset because it\'s still running. Stop timer to reset."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Timer already stopped"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"No city selected"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"The city you specified is not available"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"That city has already been added"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> added"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> deleted"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"<xliff:g id="ALARM_TIME">%s</xliff:g> alarm can\'t be dismissed yet, still more than 24 hours away"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Dismiss alarm"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Pick which alarm to dismiss"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"No firing alarms"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"<xliff:g id="ALARM_TIME">%s</xliff:g> alarm snoozed for 10 minutes"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 368bba4..aa720d1 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Alarm set for <xliff:g id="HOURS">%2$s</xliff:g> and <xliff:g id="MINUTES">%3$s</xliff:g> from now."</item>
     <item msgid="2332583385137381060">"Alarm set for <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> and <xliff:g id="MINUTES">%3$s</xliff:g> from now."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 day"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> days"</string>
-    <string name="hour" msgid="2546819039651509323">"1 hour"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> hours"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minute"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutes"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> days</item>
+      <item quantity="one">1 day</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> hours</item>
+      <item quantity="one">1 hour</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
+      <item quantity="one">1 minute</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Every day"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Choose a clock"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Settings"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Snooze length"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutes</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
       <item quantity="one">1 minute</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minute</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Silence after"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutes"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutes</item>
+      <item quantity="one">1 minute</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Never"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minute"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"My time is <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Lap times:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Lap <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> hours</item>
       <item quantity="one">1 hour</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Expand alarm"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Collapse alarm"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"Undo"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarm deleted."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarm deleted"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Next alarm: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h.mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Invalid time <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"No alarm at <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"No scheduled alarms"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Stopwatch is already running"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Stopwatch isn\'t running"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Stopwatch mode changed"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"No alarm scheduled for this time"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"<xliff:g id="ALARM_TIME">%s</xliff:g> alarm dismissed"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"No timer set"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Timer deleted"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Timer already running"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Unable to complete your request, multiple timers available"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Timer started"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Timer reset"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Timer can\'t be reset because it\'s still running. Stop timer to reset."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Timer already stopped"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"No city selected"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"The city you specified is not available"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"That city has already been added"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> added"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> deleted"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"<xliff:g id="ALARM_TIME">%s</xliff:g> alarm can\'t be dismissed yet, still more than 24 hours away"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Dismiss alarm"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Pick which alarm to dismiss"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"No firing alarms"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"<xliff:g id="ALARM_TIME">%s</xliff:g> alarm snoozed for 10 minutes"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 368bba4..aa720d1 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Alarm set for <xliff:g id="HOURS">%2$s</xliff:g> and <xliff:g id="MINUTES">%3$s</xliff:g> from now."</item>
     <item msgid="2332583385137381060">"Alarm set for <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> and <xliff:g id="MINUTES">%3$s</xliff:g> from now."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 day"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> days"</string>
-    <string name="hour" msgid="2546819039651509323">"1 hour"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> hours"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minute"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutes"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> days</item>
+      <item quantity="one">1 day</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> hours</item>
+      <item quantity="one">1 hour</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
+      <item quantity="one">1 minute</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Every day"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Choose a clock"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Settings"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Snooze length"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutes</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
       <item quantity="one">1 minute</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minute</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Silence after"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutes"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutes</item>
+      <item quantity="one">1 minute</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Never"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minute"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"My time is <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Lap times:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Lap <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> hours</item>
       <item quantity="one">1 hour</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Expand alarm"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Collapse alarm"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"Undo"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarm deleted."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarm deleted"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Next alarm: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h.mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Invalid time <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"No alarm at <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"No scheduled alarms"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Stopwatch is already running"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Stopwatch isn\'t running"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Stopwatch mode changed"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"No alarm scheduled for this time"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"<xliff:g id="ALARM_TIME">%s</xliff:g> alarm dismissed"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"No timer set"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Timer deleted"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Timer already running"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Unable to complete your request, multiple timers available"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Timer started"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Timer reset"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Timer can\'t be reset because it\'s still running. Stop timer to reset."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Timer already stopped"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"No city selected"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"The city you specified is not available"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"That city has already been added"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> added"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> deleted"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"<xliff:g id="ALARM_TIME">%s</xliff:g> alarm can\'t be dismissed yet, still more than 24 hours away"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Dismiss alarm"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Pick which alarm to dismiss"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"No firing alarms"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"<xliff:g id="ALARM_TIME">%s</xliff:g> alarm snoozed for 10 minutes"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 362ce4c..6db3e09 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"La alarma sonará en <xliff:g id="HOURS">%2$s</xliff:g> y <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
     <item msgid="2332583385137381060">"La alarma sonará en <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> y <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"un día"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> días"</string>
-    <string name="hour" msgid="2546819039651509323">"1 hora"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> horas"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minuto"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutos"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> días</item>
+      <item quantity="one">1 día</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
+      <item quantity="one">1 hora</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
+      <item quantity="one">1 minuto</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Todos los días"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Seleccionar un reloj"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Configuración"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Repetición de alarma"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutos</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
       <item quantity="one">1 minuto</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minuto</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Silenciar automáticamente"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutos"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutos</item>
+      <item quantity="one">1 minuto</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Nunca"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minuto"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Mi hora es <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Duración:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Vuelta <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"N.º <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"N.º <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> horas</item>
       <item quantity="one">1 hora</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Expandir alarma"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Contraer alarma"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"deshacer"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarma eliminada"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarma eliminada"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/<xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Siguiente alarma: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"La hora <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g> no es válida"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"No hay ninguna alarma programada a las <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"No hay alarmas programadas"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"El cronómetro ya se está ejecutando"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"El cronómetro no se está ejecutando"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Se cambió el modo del cronómetro"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"No hay ninguna alarma programada para esta hora"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Se ignoró la alarma <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"No se configuró ningún temporizador"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Se borró el temporizador"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"El temporizador ya se está ejecutando"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"No se puede completar la solicitud porque hay varios temporizadores disponibles"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Se inició el temporizador"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Se restableció el temporizador"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"No se puede restablecer el temporizador porque todavía se está ejecutando. Para restablecerlo, detén el temporizador."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"El temporizador ya se detuvo"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"No se seleccionó ninguna ciudad"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"La ciudad que especificaste no está disponible"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Esa ciudad ya se agregó"</string>
+    <string name="city_added" msgid="1335509457349179514">"Se agregó la ciudad <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Se borró la ciudad <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Todavía no se puede ignorar la alarma <xliff:g id="ALARM_TIME">%s</xliff:g> porque aún faltan más de 24 horas para que se active."</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Ignorar alarma"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Elige la alarma que quieres ignorar"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"No hay alarmas activas"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"La alarma <xliff:g id="ALARM_TIME">%s</xliff:g> se pospuso por diez minutos"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2e053a7..ea68896 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"La alarma sonará en <xliff:g id="HOURS">%2$s</xliff:g> y <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
     <item msgid="2332583385137381060">"La alarma sonará en <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> y <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 día"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> días"</string>
-    <string name="hour" msgid="2546819039651509323">"1 hora"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> horas"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minuto"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutos"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> días</item>
+      <item quantity="one">1 día</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
+      <item quantity="one">1 hora</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
+      <item quantity="one">1 minuto</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Todos los días"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Seleccionar un reloj"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Ajustes"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Repetir alarma después de"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutos</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
       <item quantity="one">1 minuto</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minuto</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Silenciar después de"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutos"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutos</item>
+      <item quantity="one">1 minuto</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Nunca"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minuto"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Hora: <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Duración de las vueltas:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Vuelta <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"N.º <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"N.º <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> horas</item>
       <item quantity="one">1 hora</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Expandir alarma"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Contraer alarma"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"Deshacer"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarma eliminada"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarma eliminada"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Próxima alarma: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"No hay ninguna alarma programada"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Ya se está utilizando el cronómetro"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"No se está utilizando el cronómetro"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Modo de cronómetro cambiado"</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Alarma de las <xliff:g id="ALARM_TIME">%s</xliff:g> ignorada"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"No se ha establecido ningún temporizador"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Temporizador eliminado"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Ya se está utilizando el temporizador"</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"Temporizador iniciado"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Temporizador restablecido"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"No se puede restablecer el temporizador porque aún se está utilizando. Debes detenerlo para restablecerlo."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Ya se ha detenido el temporizador"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"No has seleccionado ninguna ciudad"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"La ciudad especificada no está disponible"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Esa ciudad ya se ha añadido"</string>
+    <string name="city_added" msgid="1335509457349179514">"Se ha añadido <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Se ha eliminado <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Aún no se puede ignorar la alarma de las <xliff:g id="ALARM_TIME">%s</xliff:g> porque quedan más de 24 horas"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Ignorar alarma"</string>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <string name="no_firing_alarms" msgid="4986161963178722289">"No hay ninguna alarma activada"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Alarma de las <xliff:g id="ALARM_TIME">%s</xliff:g> pospuesta 10 minutos"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 2d05ec2..45010b7 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Äratuseni on jäänud <xliff:g id="HOURS">%2$s</xliff:g> ja <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
     <item msgid="2332583385137381060">"Selle äratuseni on <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> ja <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 päev"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> päeva"</string>
-    <string name="hour" msgid="2546819039651509323">"1 tund"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> tundi"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minut"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutit"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> päeva</item>
+      <item quantity="one">1 päev</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> tundi</item>
+      <item quantity="one">1 tund</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutit</item>
+      <item quantity="one">1 minut</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Iga päev"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Valige kell"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Seaded"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Äratuse edasilükkamise pikkus"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutit</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutit</item>
       <item quantity="one">1 minut</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minut</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Vaikus pärast"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutit"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutit</item>
+      <item quantity="one">1 minut</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Mitte kunagi"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minut"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Minu aeg on <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Ringi ajad:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. ring"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"Nr <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"Nr <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> tundi</item>
       <item quantity="one">1 tund</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Äratuse laiendamine"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Äratuse ahendamine"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"võta tagasi"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Äratus on kustutatud."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Äratus on kustutatud"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Järgmine äratus: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Sobimatu aeg <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Kellaajaks <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g> ei ole alarmi määratud"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Ühtegi määratud alarmi pole"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Stopper juba käib"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Stopper ei käi"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Stopperi režiimi muudeti"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Selleks kellaajaks ei ole alarmi määratud"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Alarmist kellaajaks <xliff:g id="ALARM_TIME">%s</xliff:g> loobuti"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Taimerit pole määratud"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Taimer kustutati"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Taimer juba käib"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Taotlust ei saa lõpule viia, saadaval on mitu taimerit"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Taimer käivitati"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Taimer lähtestati"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Taimerit ei saa lähtestada, kuna see alles käib. Lähtestamiseks peatage taimer."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Taimer juba peatati"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Ühtegi linna pole valitud"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Määratud linn pole saadaval"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"See linn on juba lisatud"</string>
+    <string name="city_added" msgid="1335509457349179514">"Lisati <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Kustutati <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Alarmist kell <xliff:g id="ALARM_TIME">%s</xliff:g> ei saa veel loobuda, kuna selleni on enam kui 24 tundi aega"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Loobu alarmist"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Valige alarm, millest soovite loobuda"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Ühtegi käivitatavat alarmi pole"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Alarm kellaajaks <xliff:g id="ALARM_TIME">%s</xliff:g> lükati 10 minutit edasi"</string>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 77ef1d7..93baf88 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Alarma <xliff:g id="HOURS">%2$s</xliff:g> egun eta <xliff:g id="MINUTES">%3$s</xliff:g> ordu barru jotzeko ezarri da."</item>
     <item msgid="2332583385137381060">"Alarma <xliff:g id="DAYS">%1$s</xliff:g> egun, <xliff:g id="HOURS">%2$s</xliff:g> ordu eta <xliff:g id="MINUTES">%3$s</xliff:g> minutu barru jotzeko ezarri da."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 egun"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> egun"</string>
-    <string name="hour" msgid="2546819039651509323">"1 ordu"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> ordu"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minutu"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutu"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> egun</item>
+      <item quantity="one">Egun bat</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ordu</item>
+      <item quantity="one">Ordubete</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutu</item>
+      <item quantity="one">Minutu bat</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Egunero"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Aukeratu erloju bat"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Ezarpenak"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Atzerapenaren luzera"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutu</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutu</item>
       <item quantity="one">1 minutu</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minutu</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Gelditu tarte hau igaro ondoren"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutu"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutu</item>
+      <item quantity="one">Minutu bat</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Inoiz ez"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minutu"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Nire denbora <xliff:g id="TIME">%s</xliff:g> da"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Itzulien denborak:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. itzulia"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"<xliff:g id="NUMBER">%d</xliff:g>.a"</item>
+    <item msgid="316923361931627987">"<xliff:g id="NUMBER">%02d</xliff:g>.a"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ordu</item>
       <item quantity="one">1 ordu</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Zabaldu alarma"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Tolestu alarma"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"desegin"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarma ezabatu da."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Ezabatu da alarma"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Hurrengo alarma: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Ordu honek ez du balio: <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Ez dago alarmarik (<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>)"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Ez dago alarmarik programatuta"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Kronometroa abian da dagoeneko"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Kronometroa ez da abian"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Aldatu da kronometroaren modua"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Ez dago alarmarik programatuta ordu horretarako"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Baztertu da <xliff:g id="ALARM_TIME">%s</xliff:g> alarma"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Ez dago tenporizadorerik ezarrita"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Ezabatu da tenporizadorea"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Tenporizadorea abian da dagoeneko"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Ezin da eskaera osatu; tenporizadore bat baino gehiago dago"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Abiarazi da tenporizadorea"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Berrezarri da tenporizadorea"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Ezin da berrezarri tenporizadorea, oraindik abian baita. Berrezartzeko, gelditu tenporizadorea."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Tenporizadorea gelditu da dagoeneko"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Ez da hautatu hiririk"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Adierazi duzun hiria ez dago erabilgarri"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Hiri hori gehitu da dagoeneko"</string>
+    <string name="city_added" msgid="1335509457349179514">"Gehitu da <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Ezabatu da <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Ezin da baztertu <xliff:g id="ALARM_TIME">%s</xliff:g> alarma oraindik, hemendik 24 ordurako baino gehiagorako programatuta dagoelako"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Baztertu alarma"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Hautatu baztertu nahi duzun alarma"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Ez dago alarmarik abian"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"10 minutuz atzeratu da <xliff:g id="ALARM_TIME">%s</xliff:g> alarma"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7ef3bff..96b408c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"۱ روز"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> روز"</string>
-    <string name="hour" msgid="2546819039651509323">"۱ ساعت"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> ساعت"</string>
-    <string name="minute" msgid="2486157997434653710">"۱ دقیقه"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> دقیقه"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> روز</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> روز</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ساعت</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ساعت</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> دقیقه</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> دقیقه</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"هر روز"</string>
     <string name="day_concat" msgid="971998564991636532">"، "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"انتخاب یک ساعت"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"تنظیمات"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"طول تعویق"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one">‏<xliff:g id="NUMBER">%d</xliff:g> دقیقه</item>
-      <item quantity="other">‏<xliff:g id="NUMBER">%d</xliff:g> دقیقه</item>
+      <item quantity="one">‏<xliff:g id="NUMBER">%s</xliff:g> دقیقه</item>
+      <item quantity="other">‏<xliff:g id="NUMBER">%s</xliff:g> دقیقه</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">دقیقه</item>
       <item quantity="other">دقیقه</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"سکوت پس از"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> دقیقه"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> دقیقه</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> دقیقه</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"هیچ‌وقت"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"۱ دقیقه"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"شماره <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"شماره <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one">‏<xliff:g id="NUMBER">%d</xliff:g> ساعت</item>
       <item quantity="other">‏<xliff:g id="NUMBER">%d</xliff:g> ساعت</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"هشدار بزرگ‌کردن"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"هشدار کوچک‌کردن"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"واگرد"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"هشدار حذف شد."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"هشدار حذف شد"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"هشدار بعدی: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"‏EEE، ‏h:mm ‏a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"‏EEE، ‏k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"زمان نامعتبر <xliff:g id="INVALID_PMAM">%s</xliff:g> ‏<xliff:g id="INVALID_MINUTES">%d</xliff:g>:‏<xliff:g id="INVALID_HOUR">%d</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"زنگ هشداری برای <xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>‏:<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g> تنظیم نشده است"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"هیچ زنگ هشدار زمان‌بندی‌شده‌ای وجود ندارد"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"کرونومتر در حال حاضر فعال است"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"کرونومتر فعال نیست"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"حالت کرونومتر تغییر کرد"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"هیچ تایمری تنظیم نشده است"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"تایمر حذف شد"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"تایمر در حال حاضر فعال است"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"تکمیل درخواست شما ممکن نیست، چندین تایمر وجود دارد"</string>
+    <string name="timer_started" msgid="6715582052946641641">"تایمر شروع شد"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"بازنشانی تایمر"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"تایمر بازنشانی نمی‌شود، چون هنوز فعال است. تایمر را برای بازنشانی متوقف کنید."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"تایمر در حال حاضر متوقف است"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"هیچ شهری انتخاب نشده است"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"شهری که مشخص کردید در دسترس نیست"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"این شهر قبلاً اضافه شده است"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> اضافه شد"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> حذف شد"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"<xliff:g id="ALARM_TIME">%s</xliff:g> اکنون نمی‌توانید زنگ هشدار را خاموش کنید، هنوز بیش از ۲۴ ساعت باقی‌مانده است"</string>
+    <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> به مدت ۱۰ دقیقه به تعویق افتاد"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 880773f..118fcce 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Herätykseen on aikaa <xliff:g id="HOURS">%2$s</xliff:g> ja <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
     <item msgid="2332583385137381060">"Herätykseen on aikaa <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> ja <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 päivä"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> päivää"</string>
-    <string name="hour" msgid="2546819039651509323">"1 tunti"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> tuntia"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minuutti"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minuuttia"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> päivää</item>
+      <item quantity="one">1 päivä</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> tuntia</item>
+      <item quantity="one">1 tunti</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuuttia</item>
+      <item quantity="one">1 minuutti</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Joka päivä"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Valitse kello"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Asetukset"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Torkkuajan pituus"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minuuttia</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuuttia</item>
       <item quantity="one">1 minuutti</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minuutti</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Hiljennä tämän ajan jälkeen:"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minuuttia"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minuuttia</item>
+      <item quantity="one">1 minuutti</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Ei koskaan"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minuutti"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Oma aika: <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Kierrosajat:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Kierros <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> tuntia</item>
       <item quantity="one">1 tunti</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Laajenna hälytys"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Tiivistä hälytys"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"kumoa"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Hälytys poistettu."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Hälytys poistettu"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Seuraava herätys: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k.mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h.mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k.mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Ei ajastettuja hälytyksiä"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Sekuntikello on jo käynnissä."</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Sekuntikello ei ole käynnissä."</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Sekuntikellon tila muutettiin."</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Hälytys (<xliff:g id="ALARM_TIME">%s</xliff:g>) hylättiin."</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Ajastinta ei ole asetettu."</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Ajastin poistettiin."</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Ajastin on jo käynnissä."</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"Ajastin käynnistettiin."</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Ajastin nollattiin."</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Ajastinta ei voi nollata, koska se on yhä käynnissä. Pysäytä ajastin ennen nollausta."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Ajastin on jo pysäytetty."</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Kaupunkia ei ole valittu."</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Määrittämäsi kaupunki ei ole käytettävissä."</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Kaupunki on jo lisätty."</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> lisättiin."</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> poistettiin."</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Hälytystä (<xliff:g id="ALARM_TIME">%s</xliff:g>) ei voi hylätä vielä, sillä siihen on yli 24 tuntia aikaa."</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Hylkää herätys"</string>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Ei soivia hälytyksiä"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Hälytys (<xliff:g id="ALARM_TIME">%s</xliff:g>) soi uudelleen 10 minuutin päästä."</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index b34f647..b82f7f8 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Prochaine alarme prévue dans <xliff:g id="HOURS">%2$s</xliff:g> et <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
     <item msgid="2332583385137381060">"La prochaine alarme est prévue dans <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> et <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 jour"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> jours"</string>
-    <string name="hour" msgid="2546819039651509323">"1 heure"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> heures"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minute"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutes"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> jour</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> jours</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> heure</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> heures</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Tous les jours"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Sélectionner une horloge"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"Paramètres"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Durée de la répétition"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> minute</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutes</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">minute</item>
       <item quantity="other">minutes</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Silencieux automatique après"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutes"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutes</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Jamais"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minute"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Mon heure est <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Temps de circuit :"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Tour <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"Nº <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"Nº <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> heure</item>
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> heures</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Développer l\'alarme"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Réduire l\'alarme"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"annuler"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarme supprimée."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarme supprimée"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/<xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Prochaine alarme : <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k h mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h h mm"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k h mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Heure non valide : <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Aucune alarme définie à <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Aucun alarme n\'a été programmée"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Le chronomètre est déjà en cours d\'utilisation"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Le chronomètre n\'est pas lancé"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Le mode du chronomètre a été modifié"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Aucune alarme prévue à cette heure"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"L\'alarme de <xliff:g id="ALARM_TIME">%s</xliff:g> a été ignorée"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Aucune minuterie n\'est définie"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Minuterie supprimée"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"La minuterie est déjà en cours d\'exécution"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Impossible de traiter votre demande. Plusieurs minuteries sont actives."</string>
+    <string name="timer_started" msgid="6715582052946641641">"La minuterie a été lancée"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"La minuterie a été remise à zéro"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Impossible de remettre la minuterie à zéro, car elle est toujours en cours. Arrêtez-la pour la réinitialiser."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"La minuterie est déjà arrêtée"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Aucune ville n\'a été sélectionnée"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"La ville que vous avez indiquée n\'a pas été trouvée"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Cette ville a déjà été ajoutée"</string>
+    <string name="city_added" msgid="1335509457349179514">"La ville « <xliff:g id="CITY_NAME">%s</xliff:g> » a été ajoutée"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"La ville « <xliff:g id="CITY_NAME">%s</xliff:g> » a été supprimée"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Impossible d\'ignorer l\'alarme de <xliff:g id="ALARM_TIME">%s</xliff:g> pour le moment, car celle-ci est prévue pour dans plus de 24 heures."</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Ignorer l\'alarme"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Veuillez sélectionner l\'alarme que vous souhaitez ignorer"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Aucune alarme n\'a été déclenchée"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"L\'alarme de <xliff:g id="ALARM_TIME">%s</xliff:g> a été reportée de 10 minutes"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 71861ea..d20ab24 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Prochaine alarme prévue dans <xliff:g id="HOURS">%2$s</xliff:g> et <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
     <item msgid="2332583385137381060">"La prochaine alarme est prévue dans <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> et <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 jour"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> jours"</string>
-    <string name="hour" msgid="2546819039651509323">"1 heure"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> heures"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minute"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutes"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> jour</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> jours</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> heure</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> heures</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Tous les jours"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Sélectionner une horloge"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"Paramètres"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Durée de la répétition"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> minute</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutes</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">minute</item>
       <item quantity="other">minutes</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Arrêter la sonnerie après"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutes"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutes</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Jamais"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"Une minute"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Mon heure est <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Temps de circuit :"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Tour <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"N° <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"N° <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> heure</item>
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> heures</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Développer l\'alarme"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Réduire l\'alarme"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"Annuler"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarme supprimée."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarme supprimée."</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/<xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Prochaine alarme : <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Heure non valide : <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>."</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Aucune alarme définie à <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>."</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Aucune alarme n\'est programmée."</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Le chronomètre est déjà lancé."</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Le chronomètre n\'est pas lancé."</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Le mode du chronomètre a été modifié."</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Aucune alarme n\'est programmée à cette heure."</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"L\'alarme de <xliff:g id="ALARM_TIME">%s</xliff:g> a été ignorée."</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Aucun minuteur n\'est défini."</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Le minuteur a été supprimé."</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Le minuteur est déjà lancé."</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Impossible de traiter votre demande. Plusieurs minuteurs sont disponibles."</string>
+    <string name="timer_started" msgid="6715582052946641641">"Le minuteur a été lancé."</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Le minuteur a été remis à zéro."</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Impossible de remettre le minuteur à zéro, car il est toujours en cours. Arrêtez-le pour le réinitialiser."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Le minuteur est déjà arrêté."</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Aucune ville n\'a été sélectionnée."</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"La ville indiquée n\'est pas disponible."</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Cette ville a déjà été ajoutée."</string>
+    <string name="city_added" msgid="1335509457349179514">"Une horloge a été ajoutée pour <xliff:g id="CITY_NAME">%s</xliff:g>."</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Une horloge a été supprimée pour <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Impossible d\'ignorer l\'alarme de <xliff:g id="ALARM_TIME">%s</xliff:g> pour le moment, car celle-ci est prévue pour dans plus de 24 heures."</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Ignorer l\'alarme"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Veuillez sélectionner l\'alarme que vous souhaitez ignorer."</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Aucune alarme n\'a été déclenchée."</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"L\'alarme de <xliff:g id="ALARM_TIME">%s</xliff:g> a été reportée de 10 minutes."</string>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 41a54c2..5b96013 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Alarma definida para dentro de <xliff:g id="HOURS">%2$s</xliff:g> e <xliff:g id="MINUTES">%3$s</xliff:g> a partir de agora."</item>
     <item msgid="2332583385137381060">"Alarma definida para dentro de <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> e <xliff:g id="MINUTES">%3$s</xliff:g> a partir de agora."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 día"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> días"</string>
-    <string name="hour" msgid="2546819039651509323">"1 hora"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> horas"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minuto"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutos"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> días</item>
+      <item quantity="one">Un día</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
+      <item quantity="one">Unha hora</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
+      <item quantity="one">Un minuto</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Todos os días"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Escolle un reloxo"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Configuración"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Repetir alarma despois de"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutos</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
       <item quantity="one">Un minuto</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minuto</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Silenciar despois de"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutos"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutos</item>
+      <item quantity="one">Un minuto</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Nunca"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minuto"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"O meu tempo é <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Tempos de volta:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Volta <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"N.º <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"N.º <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> horas</item>
       <item quantity="one">Unha hora</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Expande a alarma"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Contrae a alarma"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"desfacer"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Eliminouse a alarma."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Eliminouse a alarma"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Seguinte alarma: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Hora non válida <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Non hai ningunha alarma ás <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Non hai ningunha alarma programada"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Xa se está usando o cronómetro"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Non se está usando o cronómetro"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Cambiouse o modo do cronómetro"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Non hai ningunha alarma programada para esta hora"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Ignorouse a alarma das <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Non hai ningún temporizador definido"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Eliminouse o temporizador"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Xa se está usando o temporizador"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Non se puido completar a solicitude porque hai varios temporizadores dispoñibles"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Iniciouse o temporizador"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Restableceuse o temporizador"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"O temporizador non se pode restablecer porque aínda se está usando. Detén o temporizador para restablecelo."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Xa se detivo o temporizador"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Non hai ningunha cidade seleccionada"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"A cidade que especificaches non está dispoñible"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Xa se engadiu esa cidade"</string>
+    <string name="city_added" msgid="1335509457349179514">"Engadiuse <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Eliminouse <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Aínda non se pode ignorar a alarma das <xliff:g id="ALARM_TIME">%s</xliff:g> porque quedan máis de 24 horas"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Ignorar alarma"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Escolle a alarma que queres ignorar"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Non hai ningunha alarma activada"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Adiouse dez minutos a alarma das <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index a2fb6d1..1e69325 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 દિવસ"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> દિવસ"</string>
-    <string name="hour" msgid="2546819039651509323">"1 કલાક"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> કલાક"</string>
-    <string name="minute" msgid="2486157997434653710">"1 મિનિટ"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> મિનિટ"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> દિવસ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> દિવસ</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> કલાક</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> કલાક</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> મિનિટ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> મિનિટ</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"દરરોજ"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"એક ઘડિયાળ પસંદ કરો"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"સેટિંગ્સ"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"સ્નૂઝ લંબાઈ"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> મિનિટ</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> મિનિટ</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> મિનિટ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> મિનિટ</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">મિનિટ</item>
       <item quantity="other">મિનિટ</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"આના પછી શાંતિ"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> મિનિટ"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> મિનિટ</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> મિનિટ</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"ક્યારેય નહીં"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 મિનિટ"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> કલાક</item>
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> કલાક</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"એલાર્મ વિસ્તૃત કરો"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"એલાર્મ સંકુચિત કરો"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"કરેલું પાછું લાવો"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"એલાર્મ કાઢી નાખ્યો."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"એલાર્મ કાઢી નાખ્યો"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"આગલો એલાર્મ: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"અમાન્ય સમય <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g> વાગ્યે કોઈ એલાર્મ નથી"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"કોઇ શેડ્યુલ કરેલ એલાર્મ્સ નથી"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"સ્ટોપવૉચ પહેલાથી જ ચાલુ છે"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"સ્ટોપવૉચ ચાલુ નથી"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"સ્ટોપવૉચ મોડ બદલ્યો"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"કોઇ ટાઇમર સેટ નથી"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"ટાઇમર કાઢી નાખ્યું"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"ટાઇમર પહેલેથી ચાલુ છે"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"તમારી વિનંતી પૂર્ણ કરવામાં અસમર્થ, બહુવિધ ટાઇમર્સ ઉપલબ્ધ"</string>
+    <string name="timer_started" msgid="6715582052946641641">"ટાઇમર શરૂ કર્યું"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"ટાઇમર ફરીથી સેટ કર્યું"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"ટાઇમર ફરીથી સેટ કરી શકાતું નથી કારણ કે તે હજી ચાલુ છે. ફરીથી સેટ કરવા માટે ટાઇમર બંધ કરો."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"ટાઇમર પહેલેથી બંધ કરેલું છે"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"કોઇ શહેર પસંદ કરેલ નથી"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"તમે ઉલ્લેખ કરેલ શહેર ઉપલબ્ધ નથી"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"તે શહેર પહેલેથી ઉમેરેલું છે"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> ઉમેર્યું"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> કાઢી નાખ્યું"</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>
+    <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>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 371b546..5a3e7b1 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 दिन"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> दिन"</string>
-    <string name="hour" msgid="2546819039651509323">"1 घंटा"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> घंटे"</string>
-    <string name="minute" msgid="2486157997434653710">"1 मिनट"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> मिनट"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> दिन</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> दिन</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> घंटे</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> घंटे</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> मिनट</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> मिनट</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"प्रत्येक दिन"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"कोई घड़ी चुनें"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"सेटिंग"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"इतनी देर के बाद याद दिलाएं:"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> मिनट</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> मिनट</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> मिनट</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> मिनट</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">मिनट</item>
       <item quantity="other">मिनट</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"इतनी देर के बाद आवाज़ बंद करें:"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> मिनट"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> मिनट</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> मिनट</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"कभी नहीं"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 मिनट"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> घंटे</item>
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> घंटे</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"अलार्म विस्तृत करें"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"अलार्म संक्षिप्त करें"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"वापस लाएं"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"अलार्म हटा दिया गया."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"अलार्म हटा दिया गया"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"अगला अलार्म: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"अमान्य समय <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g> बजे का कोई अलार्म नहीं"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"कोई शेड्यूल किया गया अलार्म नहीं"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"स्टॉपवॉच पहले से ही चल रही है"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"स्टॉपवॉच नहीं चल रही है"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"स्टॉपवॉच मोड बदल दिया गया"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"कोई टाइमर सेट नहीं किया गया"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"टाइमर हटाया गया"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"टाइमर पहले से चल रहा है"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"आपके अनुरोध को पूरा करने में असमर्थ, एकाधिक टाइमर उपलब्ध हैं"</string>
+    <string name="timer_started" msgid="6715582052946641641">"टाइमर प्रारंभ हो गया"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"टाइमर रीसेट किया गया"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"टाइमर को रीसेट नहीं किया जा सकता क्योंकि वह अब भी चल रहा है. टाइमर को रीसेट करने के लिए उसे बंद करें."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"टाइमर पहले से बंद कर दिया गया"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"कोई शहर नहीं चुना गया"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"आपके द्वारा निर्दिष्ट शहर उपलब्ध नहीं है"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"उस शहर को पहले से जोड़ा गया है"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> जोड़ा गया"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> हटाया गया"</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>
+    <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>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 973b3d6..65263ec 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -75,12 +75,21 @@
     <item msgid="9115697840826129603">"Alarm će se oglasiti za <xliff:g id="HOURS">%2$s</xliff:g> i <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
     <item msgid="2332583385137381060">"Alarm je postavljen za <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> i <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 dan"</string>
-    <string name="days" msgid="2070509222727852210">"Broj dana: <xliff:g id="DAYS">%s</xliff:g>"</string>
-    <string name="hour" msgid="2546819039651509323">"1 sat"</string>
-    <string name="hours" msgid="2071487018566991613">"Sati: <xliff:g id="HOURS">%s</xliff:g>"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minuta"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minuta"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> dan</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> dana</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dana</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> sat</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> sata</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sati</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minuta</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuta</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Svaki dan"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Odaberite sat"</string>
@@ -89,9 +98,9 @@
     <string name="settings" msgid="5849739030579520686">"Postavke"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Trajanje odgode alarma"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> minuta</item>
-      <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> minute</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minuta</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minuta</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuta</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">minuta</item>
@@ -99,7 +108,11 @@
       <item quantity="other">minuta</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Utišaj nakon"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> min"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minuta</item>
+      <item quantity="few"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minuta</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Nikada"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minuta"</item>
@@ -176,6 +189,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Moje je vrijeme <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Vremena krugova:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. krug"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"Br. <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"Br. <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> sat</item>
       <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> sata</item>
@@ -338,7 +355,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Proširi alarm"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Sažmi alarm"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"poništi"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarm je izbrisan."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarm je izbrisan"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/<xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Sljedeći alarm: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -359,4 +376,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Nema postavljenih alarma"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Štoperica je već pokrenuta"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Štoperica nije pokrenuta"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Promijenjen je način štoperice"</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Odbačen je alarm u <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Nema postavljenih tajmera"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Tajmer je izbrisan"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Tajmer je već pokrenut"</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"Tajmer je pokrenut"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Tajmer je poništen"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Tajmer se ne može poništiti jer još uvijek radi. Zaustavite ga da biste ga poništili."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Tajmer je već zaustavljen"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Nije odabran nijedan grad"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Grad koji ste naveli nije dostupan"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Taj je grad već dodan"</string>
+    <string name="city_added" msgid="1335509457349179514">"Dodan je grad <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Izbrisan je grad <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Alarm u <xliff:g id="ALARM_TIME">%s</xliff:g> još se ne može odbaciti jer do njega još uvijek ima više od 24 sata"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Odbacivanje alarma"</string>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Nema aktiviranih alarma"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Alarm u <xliff:g id="ALARM_TIME">%s</xliff:g> odgođen je za 10 minuta"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index fb918a4..278477a 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Riasztás beállítva: a jelenlegi időponttól számított <xliff:g id="HOURS">%2$s</xliff:g> és <xliff:g id="MINUTES">%3$s</xliff:g> múlva."</item>
     <item msgid="2332583385137381060">"Riasztás beállítva: a jelenlegi időponttól számított <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> és <xliff:g id="MINUTES">%3$s</xliff:g> múlva."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 nap"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> nap"</string>
-    <string name="hour" msgid="2546819039651509323">"1 óra"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> óra"</string>
-    <string name="minute" msgid="2486157997434653710">"1 perc"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> perc"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> nap</item>
+      <item quantity="one">1 nap</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> óra</item>
+      <item quantity="one">1 óra</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> perc</item>
+      <item quantity="one">1 perc</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Minden nap"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Válasszon egy órát"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Beállítások"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Szundi időtartama"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> perc</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> perc</item>
       <item quantity="one">1 perc</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">perc</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Elnémítás ennyi idő után:"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> perc"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> perc</item>
+      <item quantity="one">1 perc</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Soha"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 perc"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Az én időm: <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Köridők:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. kör"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"Körök száma <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"Körök száma <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> óra</item>
       <item quantity="one">1 óra</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Ébresztő megnyitása"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Ébresztő bezárása"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"visszavonás"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Törölve."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Ébresztés törölve"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Következő ébresztés: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Érvénytelen időpont: <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Nincs riasztás ekkor: <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Nincs ütemezett riasztás"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"A stopper már elindult"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"A stopper nem indult el"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Stopper mód módosítva"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Nincs riasztás beállítva erre az időpontra"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"<xliff:g id="ALARM_TIME">%s</xliff:g> – riasztás elvetve"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Nincs időzítő beállítva"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Időzítő törölve"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Az időzítő már elindult"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Nem sikerült teljesíteni a műveletet, mert több időzítő áll rendelkezésre"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Időzítő elindítva"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Időzítő visszaállítva"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Az időzítőt nem lehet visszaállítani, mert még mindig fut. Állítsa le a visszaállításhoz."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Az időzítő már megállt"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Nincs város kiválasztva"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"A megadott város nem érhető el"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Ez a város már hozzá van adva"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> hozzáadva"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> törölve"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"<xliff:g id="ALARM_TIME">%s</xliff:g> – a riasztást még nem lehet elvetni, több mint 24 óra múlva esedékes"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Riasztás elvetése"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Válassza ki az elvetni kívánt riasztást"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Nincs éles riasztás"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"<xliff:g id="ALARM_TIME">%s</xliff:g> – riasztás elhalasztva 10 perccel"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 0c8d8f6..8177ba0 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 օր"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> օր"</string>
-    <string name="hour" msgid="2546819039651509323">"1 ժամ"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> ժամ"</string>
-    <string name="minute" msgid="2486157997434653710">"1 րոպե"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> րոպե"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> օր</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> օր</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ժամ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ժամ</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> րոպե</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> րոպե</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Ամեն օր"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Ընտրեք ժամացույցը"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"Կարգավորումներ"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Ննջման տևողությունը"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> րոպե</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> րոպե</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> րոպե</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> րոպե</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">րոպե</item>
       <item quantity="other">րոպե</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Լռել"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> րոպեից"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> րոպե</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> րոպե</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Երբեք"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 րոպե"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ժամ</item>
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ժամ</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Ընդարձակել զարթուցիչը"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Թաքցնել զարթուցիչը"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"հետարկել"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Զարթուցիչը ջնջված է:"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Զարթուցիչը ջնջված է"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Հաջորդ զարթուցիչը՝ <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Հերթագրված զարթուցիչներ չկան"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Վայրկյանաչափը արդեն աշխատում է"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Վայրկյանաչափը չի աշխատում"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Վայրկյանաչափի ռեժիմը փոխվել է"</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Ժ. <xliff:g id="ALARM_TIME">%s</xliff:g>-ի զարթուցիչը անտեսված է"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Տեղակայված ժամաչափ չկա"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Ժամաչափը ջնջված է"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Ժամաչափն արդեն աշխատում է"</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"Ժամաչափը սկսված է"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Ժամաչափը վերակայված է"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Հնարավոր չէ վերակայել ժամաչափը, քանի որ այն դեռ աշխատում է: Վերակայելու համար նախ դադարեցրեք այն::"</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Ժամաչափն արդեն դադարեցված է"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Ընտրված քաղաք չկա"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Նշված քաղաքը հասանելի չէ"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Այդ քաղաքն արդեն ավելացվել է"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g>-ը ավելացվեց"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g>-ը ջնջվեց"</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>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <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>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f2bb04e..24311cf 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Alarm disetel untuk <xliff:g id="HOURS">%2$s</xliff:g> dan <xliff:g id="MINUTES">%3$s</xliff:g> dari sekarang."</item>
     <item msgid="2332583385137381060">"Alarm disetel untuk <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g>, dan <xliff:g id="MINUTES">%3$s</xliff:g> dari sekarang."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 hari"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> hari"</string>
-    <string name="hour" msgid="2546819039651509323">"1 jam"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> jam"</string>
-    <string name="minute" msgid="2486157997434653710">"1 menit"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> menit"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> hari</item>
+      <item quantity="one">1 hari</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> jam</item>
+      <item quantity="one">1 jam</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> menit</item>
+      <item quantity="one">1 menit</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Setiap hari"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Pilih jam"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Setelan"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Panjang penundaan"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> menit</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> menit</item>
       <item quantity="one">1 menit</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">menit</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Disenyapkan setelah"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> menit"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> menit</item>
+      <item quantity="one">1 menit</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Tidak Pernah"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 menit"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> jam</item>
       <item quantity="one">1 jam</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Luaskan alarm"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Ciutkan alarm"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"urungkan"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarm dihapus."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarm dihapus"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Alarm berikutnya: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"j.mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"HHH, j.mm"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"H, j.mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Waktu tidak valid <xliff:g id="INVALID_HOUR">%d</xliff:g>.<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Tidak ada alarm pukul <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>.<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Tidak ada jadwal alarm"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Stopwatch sudah berjalan"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Stopwatch tidak berjalan"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Mode stopwatch diubah"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Pewaktu tidak disetel"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Pewaktu dihapus"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Pewaktu sudah berjalan"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Tidak dapat menyelesaikan permintaan, ada beberapa pewaktu"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Pewaktu dimulai"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Pewaktu disetel ulang"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Pewaktu tidak dapat disetel ulang karena masih berjalan. Hentikan pewaktu untuk menyetel ulang."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Pewaktu sudah dihentikan"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Tidak ada kota yang dipilih"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Kota yang Anda sebutkan tidak tersedia"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Kota tersebut telah ditambahkan"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> ditambahkan"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> dihapus"</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>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Pilih alarm mana yang harus ditutup"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Tidak ada alarm yang aktif"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Alarm pukul <xliff:g id="ALARM_TIME">%s</xliff:g> ditunda selama 10 menit"</string>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 2045a44..0bc93d7 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Vekjari stilltur á <xliff:g id="HOURS">%2$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g> héðan í frá."</item>
     <item msgid="2332583385137381060">"Vekjari stilltur á <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> héðan í frá."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 dagur"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> dagar"</string>
-    <string name="hour" msgid="2546819039651509323">"1 klukkustund"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> klukkustundir"</string>
-    <string name="minute" msgid="2486157997434653710">"1 mínúta"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> mínútur"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> dagur</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dagar</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> klukkustund</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> klukkustundir</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> mínúta</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> mínútur</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Alla daga"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Veldu klukku"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"Stillingar"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Lengd blunds"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> mínúta</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> mínútur</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> mínúta</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> mínútur</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">mínúta</item>
       <item quantity="other">mínútur</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Slökkva á hljóði eftir"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> mínútur"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> mínúta</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> mínútur</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Aldrei"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 mínúta"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Tíminn minn er <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Millitímar:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Hringur <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"Nr. <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"Nr. <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> klukkustund</item>
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> klukkustundir</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Stækka vekjara"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Fella saman vekjara"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"afturkalla"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Vekjara eytt."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Vekjara eytt"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Næsti vekjari: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"HH:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, HH:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Ógildur tími <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Enginn vekjari kl. <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Engir stilltir vekjarar"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Skeiðklukka er nú þegar í gangi"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Skeiðklukka er ekki í gangi"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Skeiðklukkustillingu breytt"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Enginn vekjari stilltur fyrir þennan tíma"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Vekjari kl. <xliff:g id="ALARM_TIME">%s</xliff:g> hunsaður"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Enginn teljari stilltur"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Teljara eytt"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Teljari þegar í gangi"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Ekki hægt að afgreiða beiðnina, margir teljarar í boði"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Teljari ræstur"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Teljari endurstilltur"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Ekki er hægt að endurstilla teljara þar sem hann er enn í gangi. Stöðvaðu teljarann til að endurstilla hann."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Teljari þegar stöðvaður"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Engin borg valin"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Borgin sem þú tilgreindir er ekki tiltæk"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Þessari borg hefur þegar verið bætt við"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> bætt við"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> eytt"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Ekki er enn hægt að hunsa vekjara kl. <xliff:g id="ALARM_TIME">%s</xliff:g> þar sem hann hringir eftir meira en sólarhring"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Hunsa viðvörun"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Velja hvaða vekjara á að hunsa"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Engar hringingar"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Vekjari kl. <xliff:g id="ALARM_TIME">%s</xliff:g> stilltur á tíu mínútna blund"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e5f0c52..adaf7c6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"La sveglia sarà attivata tra <xliff:g id="HOURS">%2$s</xliff:g> e <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
     <item msgid="2332583385137381060">"La sveglia sarà attivata tra <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> e <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 giorno"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> giorni"</string>
-    <string name="hour" msgid="2546819039651509323">"1 ora"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> ore"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minuto"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minuti"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> giorni</item>
+      <item quantity="one">1 giorno</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ore</item>
+      <item quantity="one">1 ora</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuti</item>
+      <item quantity="one">1 minuto</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Ogni giorno"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Scegli un orologio"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Impostazioni"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Intervallo ripetizione allarme"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minuti</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuti</item>
       <item quantity="one">1 minuto</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minuto</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Disattiva suoneria dopo"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minuti"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minuti</item>
+      <item quantity="one">1 minuto</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Mai"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minuto"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Il mio tempo è <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Tempi sul giro:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Giro <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"n. <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"n. <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ore</item>
       <item quantity="one">1 ora</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Espandi sveglia"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Comprimi sveglia"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"annulla"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Sveglia eliminata."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Allarme eliminato"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/<xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Prossima sveglia: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Orario <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g> non valido"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Nessuna sveglia alle <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Nessuna sveglia pianificata"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Cronometro già in esecuzione"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Cronometro non in esecuzione"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Modalità cronometro cambiata"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Nessuna sveglia pianificata per questo orario"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Sveglia alle <xliff:g id="ALARM_TIME">%s</xliff:g> ignorata"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Nessun timer impostato"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Timer eliminato"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Timer già in esecuzione"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Impossibile completare la richiesta. Diversi timer disponibili"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Timer avviato"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Timer reimpostato"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Impossibile reimpostare il timer perché è ancora in esecuzione. Per reimpostare il timer, interrompilo."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Timer già interrotto"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Nessuna città selezionata"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"La città specificata non è disponibile"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"La città è già stata aggiunta"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> aggiunta"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> eliminata"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Non è ancora possibile ignorare la sveglia alle <xliff:g id="ALARM_TIME">%s</xliff:g> perché mancano ancora più di 24 ore alla sveglia"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Ignora sveglia"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Scegli la sveglia da ignorare"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Nessuna sveglia da attivare"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Sveglia alle <xliff:g id="ALARM_TIME">%s</xliff:g> posticipata di 10 minuti"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f72c56b..809a955 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -77,12 +77,24 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"יום אחד"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> ימים"</string>
-    <string name="hour" msgid="2546819039651509323">"שעה אחת"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> שעות"</string>
-    <string name="minute" msgid="2486157997434653710">"דקה אחת"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> דקות"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="two"><xliff:g id="NUMBER">%s</xliff:g> ימים</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> ימים</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ימים</item>
+      <item quantity="one">יום אחד</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="two"><xliff:g id="NUMBER">%s</xliff:g> שעות</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> שעות</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> שעות</item>
+      <item quantity="one">שעה אחת</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="two"><xliff:g id="NUMBER">%s</xliff:g> דקות</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> דקות</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> דקות</item>
+      <item quantity="one">דקה אחת</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"מדי יום"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"בחר שעון"</string>
@@ -91,9 +103,9 @@
     <string name="settings" msgid="5849739030579520686">"הגדרות"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"משך הנדנוד"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="two"><xliff:g id="NUMBER">%d</xliff:g> דקות</item>
-      <item quantity="many"><xliff:g id="NUMBER">%d</xliff:g> דקות</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> דקות</item>
+      <item quantity="two"><xliff:g id="NUMBER">%s</xliff:g> דקות</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> דקות</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> דקות</item>
       <item quantity="one">דקה אחת</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -103,7 +115,12 @@
       <item quantity="one">דקה</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"השתק לאחר"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> דקות"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="two"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> דקות</item>
+      <item quantity="many"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> דקות</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> דקות</item>
+      <item quantity="one">דקה אחת</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"לעולם לא"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"דקה"</item>
@@ -180,6 +197,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"מס\' <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"מס\' <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="two"><xliff:g id="NUMBER">%d</xliff:g> שעות</item>
       <item quantity="many"><xliff:g id="NUMBER">%d</xliff:g> שעות</item>
@@ -345,7 +366,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"הרחב התראה"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"כווץ התראה"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"בטל"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"ההתראה נמחקה."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"ההתראה נמחקה"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"ההתראה הבאה: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -367,4 +388,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"‏EEE‏, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"‏EEE‏, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"שעה לא חוקית <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"‏אין התראה ב-‎<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>‎"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"לא נקבעו התראות"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"שעון העצר כבר פועל"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"שעון העצר אינו פועל"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"מצב שעון העצר השתנה"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"לא הוגדר טיימר"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"הטיימר נמחק"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"הטיימר כבר פועל"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"לא ניתן להשלים את הבקשה. יש מספר טיימרים זמינים"</string>
+    <string name="timer_started" msgid="6715582052946641641">"הטיימר הופעל"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"הטיימר אופס"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"לא ניתן לאפס את הטיימר כי הוא עדיין פועל. הפסק את הטיימר כדי לאפס."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"הטיימר כבר הופסק"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"לא נבחרה עיר"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"העיר שציינת אינה זמינה"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"העיר הזו כבר נוספה"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> נוספה"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> נמחקה"</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>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"אין התראות הפועלות כעת"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"ההתראה של <xliff:g id="ALARM_TIME">%s</xliff:g> הועברה למצב נודניק למשך עשר דקות"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f810ecd..0e7be7a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1日"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g>日"</string>
-    <string name="hour" msgid="2546819039651509323">"1時間"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g>時間"</string>
-    <string name="minute" msgid="2486157997434653710">"1分"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g>分"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g>日</item>
+      <item quantity="one">1日</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g>時間</item>
+      <item quantity="one">1時間</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g>分</item>
+      <item quantity="one">1分</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"毎日"</string>
     <string name="day_concat" msgid="971998564991636532">"、 "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"時計の選択"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"設定"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"スヌーズの長さ"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g>分</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g>分</item>
       <item quantity="one">1分</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">分</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"消音までの時間"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g>分"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g>分</item>
+      <item quantity="one">1分</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"なし"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1分"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g>時間</item>
       <item quantity="one">1時間</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"アラームを展開"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"アラームを折りたたむ"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"元に戻す"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"アラームを削除しました。"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"アラームを削除しました"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"次のアラーム: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE、h:mma"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE、k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"無効な時間<xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g><xliff:g id="INVALID_PMAM">%s</xliff:g>が指定されました"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>に設定されたアラームはありません"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"設定されたアラームはありません"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"ストップウォッチは既に作動しています"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"ストップウォッチは作動していません"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"ストップウォッチのモードを変更しました"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"設定されたタイマーはありません"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"タイマーを削除しました"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"タイマーは既に作動しています"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"リクエストを完了できません。複数のタイマーがあります"</string>
+    <string name="timer_started" msgid="6715582052946641641">"タイマーを開始しました"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"タイマーをリセットしました"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"作動中のため、タイマーをリセットすることはできません。タイマーをリセットするには停止してください。"</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"タイマーは既に停止しています"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"都市が選択されていません"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"指定された都市は使用できません"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"この都市は既に追加されています"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g>を追加しました"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g>を削除しました"</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>
+    <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>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 6df79ee..b27764e 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 დღე"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> დღე"</string>
-    <string name="hour" msgid="2546819039651509323">"1 საათი"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> საათი"</string>
-    <string name="minute" msgid="2486157997434653710">"1 წუთი"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> წუთი"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> დღე</item>
+      <item quantity="one">1 დღე</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> საათი</item>
+      <item quantity="one">1 საათი</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> წუთი</item>
+      <item quantity="one">1 წუთი</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"ყოველ დღე"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"საათის არჩევა"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"პარამეტრები"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"ჩაჩუმების სიგრძე"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> წუთი</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> წუთი</item>
       <item quantity="one">1 წუთი</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">წუთი</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"სიჩუმე გააქტიურდება:"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> წუთი"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> წუთი</item>
+      <item quantity="one">1 წუთი</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"არასოდეს"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 წუთი"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> საათი</item>
       <item quantity="one">1 საათი</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"მაღვიძარას გაფართოება"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"მაღვიძარას ხედის შემცირება"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"მოქმედების გაუქმება"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"მაღვიძარა წაშლილია."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"მაღვიძარა წაშლილია"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"მომდევნო მაღვიძარა: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"დაგეგმილი მაღვიძარა არ არის"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"წამზომი უკვე გაშვებულია"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"წამზომი გაშვებული არ არის"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"წამზომის რეჟიმი შეიცვალა"</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"<xliff:g id="ALARM_TIME">%s</xliff:g>-ზე მაღვიძარა გაუქმებულია"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"ტაიმერი დაყენებული არ არის"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"ტაიმერი წაშლილია"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"ტაიმერი უკვე გაშვებულია"</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"ტაიმერი დაწყებულია"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"ტაიმერი ჩამოყრილია"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"ტაიმერის ჩამოყრა ვერ მოხერხდება, რადგანაც ის ჯერ კიდევ გაშვებულია. ჩამოსაყრელად შეაჩერეთ ტაიმერი."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"ტაიმერი უკვე შეჩერდა"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"ქალაქი არჩეული არ არის"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"მითითებული ქალაქი ხელმისაწვდომი არ არის"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"ეს ქალაქი უკვე დამატებულია"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> დამატებულია"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> წაშლილია"</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>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <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>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index f5c027b..f66a7d5 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 күн"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> күн"</string>
-    <string name="hour" msgid="2546819039651509323">"1 сағат"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> сағат"</string>
-    <string name="minute" msgid="2486157997434653710">"1 минут"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> минут"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> күн</item>
+      <item quantity="one">1 күн</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> сағат</item>
+      <item quantity="one">1 сағат</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минут</item>
+      <item quantity="one">1 минут</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Күн сайын"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Сағатты таңдау"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Параметрлер"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Кейінге қалдыру ұзақтығы"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> минут</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минут</item>
       <item quantity="one">1 минут</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">минут</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Дыбысын автоматты өшіру"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> минут"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> минут</item>
+      <item quantity="one">1 минут</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Ешқашан"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 минут"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"№ <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"№ <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> сағат</item>
       <item quantity="one">1 сағат</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Дабылды жаю"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Дабылды тасалау"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"кері қайтару"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Дабыл жойылды."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Дабыл жойылды"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Келесі дабыл: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"к:мм"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, сағ: мм а"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, к: мм"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Жарамсыз уақыт: <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g> уақытында дабыл жоқ"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Жоспарланған дабылдар жоқ"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Секундомер істеп тұр"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Секундомер істеп тұрған жоқ"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Секундомер режимі өзгерді"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Таймер орнатылмаған"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Таймер жойылды"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Таймер істеп тұр"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Сұрауды аяқтау мүмкін емес, бірнеше таймер қол жетімді"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Таймер қосылды"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Таймер ысырылды"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Таймерді ысыру мүмкін емес, өйткені ол әлі жұмыс істеп тұр. Ысыру үшін таймерді тоқтатыңыз."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Таймер тоқтап қалған"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Қала таңдалмаған"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Сіз көрсеткен қала қолжетімді емес"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Бұл қала бұрыннан қосылған"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> қосылды"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> жойылды"</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>
+    <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>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 1fab502..afee534 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"១ ថ្ងៃ"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> ថ្ងៃ"</string>
-    <string name="hour" msgid="2546819039651509323">"១ ម៉ោង"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> ម៉ោង"</string>
-    <string name="minute" msgid="2486157997434653710">"១ នាទី"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> នាទី"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ថ្ងៃ</item>
+      <item quantity="one">1 ថ្ងៃ</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ម៉ោង</item>
+      <item quantity="one">1 ម៉ោង</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> នាទី</item>
+      <item quantity="one">1 នាទី</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"រាល់ថ្ងៃ"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"ជ្រើស​នាឡិកា"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"ការ​កំណត់"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"រយៈពេល​ផ្អាក"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> នាទី</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> នាទី</item>
       <item quantity="one">1 នាទី</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">នាទី</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"បិទ​សំឡេង​បន្ទាប់ពី"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> នាទី"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> នាទី</item>
+      <item quantity="one">1 នាទី</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"កុំ"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"១​នាទី"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ម៉ោង</item>
       <item quantity="one">1 ម៉ោង</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"ពង្រីក​សំឡេង​រោទ៍"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"បង្រួម​សំឡេង​រោទ៍"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"​មិន​​ធ្វើ​វិញ"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"បាន​លុប​សំឡេង​រោទ៍។"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"បានលុបម៉ោងរោទិ៍"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"សំឡេង​រោទ៍​បន្ទាប់៖ <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"ម៉ោងមិនត្រឹមត្រូវ <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"គ្មានម៉ោងរោទិ៍នៅ <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"គ្មានម៉ោងរោទិ៍បានកំណត់ទេ"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"នាឡិកាបញ្ឈប់កំពុងដំណើរហើយ"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"នាឡិកាបញ្ឈប់មិនដំណើរការទេ"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"បានប្តូររបៀបនាឡិកាបញ្ឈប់"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"គ្មានការកំណត់កម្មវិធីកំណត់ពេលទេ"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"បានលុបកម្មវិធីកំណត់ពេល"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"កម្មវិធីកំណត់ពេលកំពុងដំណើរការហើយ"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"មិនអាចបញ្ចប់សំណើរបស់អ្នកបានទេ ព្រោះមានកម្មវិធីកំណត់ម៉ោងច្រើន"</string>
+    <string name="timer_started" msgid="6715582052946641641">"​​ចាប់ផ្ដើមកម្មវិធីកំណត់ពេល"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"កំណត់កម្មវិធីកំណត់ពេលឡើងវិញ"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"មិនអាចកំណត់កម្មវិធីកំណត់ពេលឡើងវិញបានទេ វាកំពុងដំណើរការនៅឡើយ។ សូមបញ្ឈប់កម្មវិធីកំណត់ពេលដើម្បីកំណត់ឡើងវិញ។"</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"កម្មវិធីកំណត់ពេលបានឈប់ហើយ"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"មិនបានជ្រើសទីក្រុងទេ"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"ទីក្រុងដែលអ្នកបានបញ្ជាក់មិនមានទេ"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"បានបន្ថែមទីក្រុងនោះរួចហើយ"</string>
+    <string name="city_added" msgid="1335509457349179514">"បានបន្ថែម <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"បានលុប <xliff:g id="CITY_NAME">%s</xliff:g>"</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>
+    <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>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 8526216..3006685 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 ದಿನ"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> ದಿನಗಳು"</string>
-    <string name="hour" msgid="2546819039651509323">"1 ಗಂಟೆ"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> ಗಂಟೆಗಳು"</string>
-    <string name="minute" msgid="2486157997434653710">"1 ನಿಮಿಷ"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> ನಿಮಿಷಗಳು"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ದಿನಗಳು</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ದಿನಗಳು</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ಗಂಟೆಗಳು</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ಗಂಟೆಗಳು</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ನಿಮಿಷಗಳು</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ನಿಮಿಷಗಳು</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"ಪ್ರತಿ ದಿನ"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"ಗಡಿಯಾರವೊಂದನ್ನು ಆರಿಸಿ"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"ಸ್ನೂಜ್ ಅವಧಿ"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ನಿಮಿಷಗಳು</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ನಿಮಿಷಗಳು</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ನಿಮಿಷಗಳು</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ನಿಮಿಷಗಳು</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">ನಿಮಿಷಗಳು</item>
       <item quantity="other">ನಿಮಿಷಗಳು</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"ಇಷ್ಟೊತ್ತಿನ ಮೇಲೆ ಮೌನವಾಗು"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> ನಿಮಿಷಗಳು"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> ನಿಮಿಷಗಳು</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> ನಿಮಿಷಗಳು</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"ಎಂದಿಗೂ ಬೇಡ"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 ನಿಮಿಷ"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ಗಂಟೆಗಳು</item>
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ಗಂಟೆಗಳು</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"ಅಲಾರಮ್ ವಿಸ್ತರಿಸಿ"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"ಅಲಾರಮ್ ಸಂಕುಚಿಸು"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"ರದ್ದುಮಾಡು"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"ಅಲಾರಂ ಅಳಿಸಲಾಗಿದೆ."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"ಅಲಾರಮ್ ಅಳಿಸಲಾಗಿದೆ"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"ಮುಂದಿನ ಅಲಾರಂ: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"ಮಾನ್ಯವಲ್ಲದ ಸಮಯ <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g> ಸಮಯಕ್ಕೆ ಯಾವುದೇ ಅಲಾರಮ್ ಇಲ್ಲ:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"ಯಾವುದೇ ನಿಗದಿಪಡಿಸಿದ ಅಲಾರಮ್‌ಗಳಿಲ್ಲ"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"ಸ್ಟಾಪ್‌ವಾಚ್ ಈಗಾಗಲೇ ರನ್ ಆಗುತ್ತಿದೆ"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"ಸ್ಟಾಪ್‌ವಾಚ್ ರನ್ ಆಗುತ್ತಿಲ್ಲ"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"ಸ್ಟಾಪ್‌ವಾಚ್ ಮೋಡ್ ಬದಲಾಯಿಸಲಾಗಿದೆ"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"ಯಾವುದೇ ಟೈಮರ್ ಹೊಂದಿಸಲಾಗಿಲ್ಲ"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"ಟೈಮರ್ ಅಳಿಸಲಾಗಿದೆ"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"ಟೈಮರ್ ಈಗಾಗಲೇ ಚಾಲನೆಯಲ್ಲಿದೆ"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"ನಿಮ್ಮ ವಿನಂತಿಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ, ಅನೇಕ ಟೈಮರ್‌ಗಳು ಲಭ್ಯ"</string>
+    <string name="timer_started" msgid="6715582052946641641">"ಟೈಮರ್‌ ಪ್ರಾರಂಭಿಸಲಾಗಿದೆ"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"ಟೈಮರ್ ಮರುಹೊಂದಿಸಲಾಗಿದೆ"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"ಟೈಮರ್ ಇನ್ನೂ ಚಾಲನೆಯಲ್ಲಿರುವ ಕಾರಣದಿಂದ ಅದನ್ನು ಮರುಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಮರುಹೊಂದಿಸಲು ಟೈಮರ್ ನಿಲ್ಲಿಸಿ."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"ಟೈಮರ್ ಈಗಾಗಲೇ ನಿಲ್ಲಿಸಲಾಗಿದೆ"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"ಯಾವುದೇ ನಗರ ಆಯ್ಕೆಮಾಡಲಾಗಿಲ್ಲ"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"ನೀವು ಸೂಚಿಸಿದ ನಗರ ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"ಆ ನಗರವನ್ನು ಈಗಾಗಲೇ ಸೇರಿಸಲಾಗಿದೆ"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> ಸೇರಿಸಲಾಗಿದೆ"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> ಅಳಿಸಲಾಗಿದೆ"</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>
+    <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>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 65bbe1b..a5d1ee7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1일"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g>일"</string>
-    <string name="hour" msgid="2546819039651509323">"1시간"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g>시간"</string>
-    <string name="minute" msgid="2486157997434653710">"1분"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g>분"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g>일</item>
+      <item quantity="one">1일</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g>시간</item>
+      <item quantity="one">1시간</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g>분</item>
+      <item quantity="one">1분</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"매일"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"시계 선택"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"설정"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"알람 일시중지 간격"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g>분</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g>분</item>
       <item quantity="one">1분</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">분</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"알람 해제 시간"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g>분"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g>분</item>
+      <item quantity="one">1분</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"사용 안함"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1분"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"<xliff:g id="NUMBER">%d</xliff:g>번"</item>
+    <item msgid="316923361931627987">"<xliff:g id="NUMBER">%02d</xliff:g>번"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g>시간</item>
       <item quantity="one">1시간</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"알람 펼치기"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"알람 접기"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"실행취소"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"알람이 삭제되었습니다."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"알람이 삭제되었습니다."</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"다음 알람: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, a h:mm"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"예약된 알람 없음"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"스톱워치가 이미 실행 중임"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"스톱워치가 실행되고 있지 않음"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"스톱워치 모드 변경됨"</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"<xliff:g id="ALARM_TIME">%s</xliff:g> 알람 제거됨"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"설정된 타이머 없음"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"타이머 삭제됨"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"타이머가 이미 실행 중임"</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"타이머 시작됨"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"타이머 재설정됨"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"타이머가 실행 중이기 때문에 재설정할 수 없습니다. 재설정하려면 타이머를 중지하세요."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"타이머가 이미 중지됨"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"선택한 도시 없음"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"사용자가 지정한 도시는 사용할 수 없음"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"이미 추가된 도시임"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> 추가됨"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> 삭제됨"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"알람 시간이 아직 24시간 이상 남아 있으므로 <xliff:g id="ALARM_TIME">%s</xliff:g> 알람을 아직 취소할 수 없습니다."</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"알람 해제"</string>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <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>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 8bbe363..59d3ea5 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 күн"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> күн"</string>
-    <string name="hour" msgid="2546819039651509323">"1 саат"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> саат"</string>
-    <string name="minute" msgid="2486157997434653710">"1 минута"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> мүнөт"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> күн</item>
+      <item quantity="one">1 күн</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> күн</item>
+      <item quantity="one">1 саат</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> мүнөт</item>
+      <item quantity="one">1 мүнөт</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Күн сайын"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Саат тандоо"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Жөндөөлөр"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Тындыруунун узактыгы"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> мүнөт</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> мүнөт</item>
       <item quantity="one">1 мүнөт</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">мүнөт</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Төмөнкүдөн кийин үнүн басып коюу"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> мүнөт"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> мүнөт</item>
+      <item quantity="one">1 мүнөт</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Эч качан"</string>
     <!-- no translation found for auto_silence_entries:1 (5431906692406316549) -->
     <!-- no translation found for auto_silence_entries:2 (7742728812068919959) -->
@@ -168,6 +177,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"#<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"#<xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> саат</item>
       <item quantity="one">1 саат</item>
@@ -327,7 +340,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Ойготкучту жайып көрсөтүү"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Ойготкучту жыйнап коюу"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"кайтаруу"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Ойготкуч жок кылынды."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Ойготкуч жок кылынды"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Кийинки ойготкуч: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -347,4 +360,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"к:мм"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, с:мм"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, к:мм"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Коюлган ойготкучтар жок"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Секундомер мурунтан эле иштеп жатат"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Секундомер иштебей эле"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Секундомер режими өзгөрдү"</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"<xliff:g id="ALARM_TIME">%s</xliff:g> ойготкучу көз жаздымда калтырылды"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Коюлган таймер жок"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Таймер жок кылынды"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Таймер мурунтан эле иштеп жатат"</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"Таймер башталды"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Таймер баштапкы абалга келтирилди"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Таймер дагы эле иштеп жаткандыктан, ал баштапкы абалга келтирилбейт. Баштапкы абалга келтирүү үчүн таймерди токтотуңуз."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Таймер мурунтан эле токтогон"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Эч шаар тандалган жок"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Сиз көрсөткөн шаар жеткиликтүү эмес"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Шаар мурунтан эле кошулган"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> кошулду"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> жок кылынды"</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>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <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>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 8b738c4..7a41c48 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 ມື້"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> ມື້"</string>
-    <string name="hour" msgid="2546819039651509323">"1 ຊົ່ວໂມງ"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> ຊົ່ວໂມງ"</string>
-    <string name="minute" msgid="2486157997434653710">"1 ນາທີ"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> ນາທີ"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ວັນ</item>
+      <item quantity="one">1 ວັນ</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ຊົ່ວ​ໂມງ</item>
+      <item quantity="one">1 ຊົ່ວໂມງ</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ນາ​ທີ</item>
+      <item quantity="one">1 ນາທີ</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"ທຸກໆມື້"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"ເລືອກໂມງ"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"ຕັ້ງຄ່າ"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"ຄວາມຍາວການປິດສຽງເຕືອນຊົ່ວຄາວ"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ນາທີ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ນາທີ</item>
       <item quantity="one">1 ນາທີ</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">ນາທີ</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"ປິດສຽງຫຼັງຈາກ"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> ນາທີ"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> ນາ​ທີ</item>
+      <item quantity="one">1 ນາທີ</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"ບໍ່ໃຊ້"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 ນາທີ"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ຊົ່ວໂມງ</item>
       <item quantity="one">1 ຊົ່ວໂມງ</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"ຂະຫຍາຍໂມງປຸກ"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"ຫຍໍ້ແຖບໂມງປຸກ"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"ຍົກເລີກ"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"ໂມງປຸກຖືກລຶບແລ້ວ."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"ໂມງປຸກຖືກລຶບແລ້ວ."</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"ໂມງປຸກຄັ້ງຕໍ່ໄປ: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"ວວ​ວ, ຊມ:ນ​ທ a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"ວວວ, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"ເວ​ລາ​ໃຊ້​ບໍ່​ໄດ້ <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"ບໍ່​ມີ​ໂມງ​ປຸກ​ຕັ້ງ​ໄວ້​ໃນ​ເວ​ລາ <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"ບໍ່​ມີ​ການ​ເຕືອນ​ກຳ​ນົດ​ໄວ້"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"ໂມງ​ຈັບ​ເວ​ລາ​ແລ່ນ​ຢູ່​ແລ້ວ"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"ໂມງ​ຈັບ​ເວ​ລາ​ບໍ່​ແລ່ນ​ຢູ່"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"ໂໝດ​ໂມງ​ຈັບ​ເວ​ລາ​ປ່ຽນ​ແປງ​ແລ້ວ"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"ບໍ່​ມີການ​ຈັບ​ເວ​ລາ​ກຳ​ນົດ​ໄວ້"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"ລຶບ​ເຄື່ອງ​ຈັບ​ເວ​ລາ​ແລ້ວ"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"ເຄື່ອງ​ຈັບ​ເວ​ລາ​ແລ່ນ​ຢູ່​ແລ້ວ"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"ບໍ່​ສາ​ມາດ​ດຳ​ເນີນ​ການ​ຂໍ​ຂອ​ງ​ທ່ານ​ໃຫ້​ສຳ​ເລັດ​ໄດ້, ມີ​ການ​ຈັບ​ເວ​ລາ​ຫຼາຍ​ອັນ​ຢູ່​ໃຫ້"</string>
+    <string name="timer_started" msgid="6715582052946641641">"​ເລີ່ມ​ການ​ຈັບ​ເວ​ລາ​ແລ້ວ"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"ການ​ຈັດ​ເວ​ລາ​ຕັ້ງ​ຄ່າ​ຄືນ​ໃໝ່​ແລ້ວ"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"ບໍ່​ສາ​ມາ​ຕັ້ງ​ຄ່າການ​ຈັບ​ເວ​ລາ​ຄືນ​ໃໝ່​ໄດ້ ເພາະ​ວ່າ​ມັນ​ກຳ​ລັງ​ແລ່ນ​ຢູ່. ຢຸດການ​ຈັບ​ເວ​ລາ ເພື່ອ​ຕັ້ງ​ຄືນ​ໃໝ່."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"ເຄື່ອງ​ຈັບ​ເວ​ລາ​ຢຸດ​ແລ້ວ"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"ບໍ່​ມີ​ເມືອງ​ຖືກ​ເລືອກ​ໄວ້"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"ບໍ່​ມີ​ເມືອງ​ທີ່​ທ່ານ​ລະ​ບຸນັ້ນ​ຢູ່"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"ເພີ່ມ​ເມືອງນັ້ນ​ໃສ່​ຮຽບ​ຮ້ອຍ​ແລ້ວ"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> ເພີ່ມ​ໃສ່​ແລ້ວ"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> ລຶບ​ແລ້ວ"</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>
+    <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>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 3149f39..69ee3a1 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -77,12 +77,24 @@
     <item msgid="9115697840826129603">"Signalas nustatytas skambėti po <xliff:g id="HOURS">%2$s</xliff:g> ir <xliff:g id="MINUTES">%3$s</xliff:g> nuo dabar."</item>
     <item msgid="2332583385137381060">"Signalas nustatytas skambėti po <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> ir <xliff:g id="MINUTES">%3$s</xliff:g> nuo dabar."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 d."</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> d."</string>
-    <string name="hour" msgid="2546819039651509323">"1 val."</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> val."</string>
-    <string name="minute" msgid="2486157997434653710">"1 min."</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> min."</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> diena</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> dienos</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> dienos</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dienų</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> valanda</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> valandos</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> valandos</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> valandų</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minutė</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minutės</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> minutės</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minučių</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Kasdien"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Pasirinkite laikrodį"</string>
@@ -91,10 +103,10 @@
     <string name="settings" msgid="5849739030579520686">"Nustatymai"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Snaudimo trukmė"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> minutė</item>
-      <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> minutės</item>
-      <item quantity="many"><xliff:g id="NUMBER">%d</xliff:g> minutės</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minučių</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minutė</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minutės</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> minutės</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minučių</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">minutė</item>
@@ -103,7 +115,12 @@
       <item quantity="other">minučių</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Nutildyti po"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> min."</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutė</item>
+      <item quantity="few"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutės</item>
+      <item quantity="many"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutės</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minučių</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Niekada"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 min."</item>
@@ -180,6 +197,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Mano laikas yra <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Persidengiantis laikas:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g> ratas"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"Nr. <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"Nr. <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> valanda</item>
       <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> valandos</item>
@@ -345,7 +366,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Išskleisti signalą"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Sutraukti signalą"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"anuliuoti"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Signalas ištrintas."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Įspėjimas ištrintas"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Kitas signalas: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -367,4 +388,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Nėra suplanuotų signalų"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Chronometras jau veikia"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Chronometras neveikia"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Pakeistas chronometro režimas"</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"<xliff:g id="ALARM_TIME">%s</xliff:g> signalo atsisakyta"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Laikmatis nenustatytas"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Laikmatis ištrintas"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Laikmatis jau veikia"</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"Laikmatis paleistas"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Laikmatis nustatytas iš naujo"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Negalima iš naujo nustatyti laikmačio, nes jis dar veikia. Sustabdykite laikmatį, kad nustatytumėte iš naujo."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Laikmatis jau sustabdytas"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Nepasirinktas joks miestas"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Nurodytas miestas nepasiekiamas"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Šis miestas jau pridėtas"</string>
+    <string name="city_added" msgid="1335509457349179514">"Pridėta <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Ištrinta <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"<xliff:g id="ALARM_TIME">%s</xliff:g> signalo dar negalima atsisakyti; dar liko daugiau nei 24 val."</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Atsisakyti signalo"</string>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Nėra suaktyvintų signalų"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"<xliff:g id="ALARM_TIME">%s</xliff:g> signalas nustatytas snausti 10 min."</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 3492206..2669609 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -75,12 +75,21 @@
     <item msgid="9115697840826129603">"Signāls iestatīts uz tālāk norādīto laiku kopš šī brīža: <xliff:g id="HOURS">%2$s</xliff:g> un <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
     <item msgid="2332583385137381060">"Signāls ir iestatīts uz tālāk norādīto laiku kopš šī brīža: <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> un <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 diena"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> diena(-as)"</string>
-    <string name="hour" msgid="2546819039651509323">"1 stunda"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> stunda(-as)"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minūte"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minūte(-es)"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="zero"><xliff:g id="NUMBER">%s</xliff:g> dienas</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> diena</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dienas</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="zero"><xliff:g id="NUMBER">%s</xliff:g> stundas</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> stunda</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> stundas</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="zero"><xliff:g id="NUMBER">%s</xliff:g> minūtes</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minūte</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minūtes</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Katru dienu"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Izvēlieties pulksteni"</string>
@@ -89,9 +98,9 @@
     <string name="settings" msgid="5849739030579520686">"Iestatījumi"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Snaudas ilgums"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="zero"><xliff:g id="NUMBER">%d</xliff:g> minūtes</item>
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> minūte</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minūtes</item>
+      <item quantity="zero"><xliff:g id="NUMBER">%s</xliff:g> minūtes</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minūte</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minūtes</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="zero">minūtes</item>
@@ -99,7 +108,11 @@
       <item quantity="other">minūtes</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Izslēgt skaņu pēc:"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minūte(-es)"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="zero"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minūtes</item>
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minūte</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minūtes</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Nekad"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minūte"</item>
@@ -176,6 +189,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Mans laiks ir: <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Intervāla laiki:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. aplis"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"Skaits: <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"Skaits: <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="zero"><xliff:g id="NUMBER">%d</xliff:g> stundas</item>
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> stunda</item>
@@ -338,7 +355,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Izvēršanas signāls"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Sakļaušanas signāls"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"atsaukt"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Signāls ir izdzēsts."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Signāls ir izdzēsts"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/<xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Nākamais signāls: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -359,4 +376,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, plkst. h:mm priekšpusdienā"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, plkst. k:mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Nav iestatītu signālu."</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Hronometrs jau darbojas."</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Hronometrs nedarbojas."</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Hronometra režīms ir nomainīts."</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Signāls plkst. <xliff:g id="ALARM_TIME">%s</xliff:g> atcelts"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Taimeris nav iestatīts."</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Taimeris ir izdzēsts."</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Taimeris jau darbojas."</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"Taimeris ir iestatīts."</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Taimeris ir atiestatīts."</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Taimeri nevar atiestatīt, jo tas joprojām darbojas. Apturiet taimeri, lai to atiestatītu."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Taimeris jau ir apturēts."</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Nav atlasīta neviena pilsēta."</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Norādītā pilsēta nav pieejama."</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Šī pilsēta jau ir pievienota."</string>
+    <string name="city_added" msgid="1335509457349179514">"Pilsēta <xliff:g id="CITY_NAME">%s</xliff:g> pievienota"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Pilsēta <xliff:g id="CITY_NAME">%s</xliff:g> izdzēsta"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Signālu plkst. <xliff:g id="ALARM_TIME">%s</xliff:g> vēl nevar atcelt. Līdz tam ir vairāk nekā 24 stundas."</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Noraidīt signālu"</string>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Nav aktīvu signālu."</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Signāls plkst. <xliff:g id="ALARM_TIME">%s</xliff:g> atlikts uz 10 minūtēm"</string>
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 9648cc3..2a8a8c6 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 ден"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> дена"</string>
-    <string name="hour" msgid="2546819039651509323">"1 час"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> часа"</string>
-    <string name="minute" msgid="2486157997434653710">"1 минута"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> минути"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ден</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> дена</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> час</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> часа</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> минута</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минути</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Секој ден"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Изберете часовник"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"Поставки"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Должина на одложување"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> минута</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> минути</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> минута</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минути</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">минута</item>
       <item quantity="other">минути</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Исклучи звук по"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> минути"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> минута</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> минути</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Никогаш"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 минута"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> час</item>
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> часа</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Прошири аларм"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Собери аларм"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"врати"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Алармот е избришан."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Алармот е избришан"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/<xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Следен аларм: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Неважечко време <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Нема аларм во <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Нема закажани аларми"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Штоперицата веќе работи"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Штоперицата не работи"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Режимот на штоперицата е сменет"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Нема поставен тајмер"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Тајмерот е избришан"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Тајмерот веќе работи"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Вашето барање не може да се исполни бидејќи има повеќе достапни тајмери"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Тајмерот е вклучен"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Тајмерот е ресетиран"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Тајмер не може да се ресетира бидејќи уште работи. Запрете го тајмерот за да го ресетирате."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Тајмер веќе запре"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Нема избран град"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Градот што го зададовте не е достапен"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Тој град веќе е додаден"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> е додаден"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> е избришан"</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>
+    <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>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index ca28ae3..4a409c0 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"ഒരു ദിവസം"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> ദിവസം"</string>
-    <string name="hour" msgid="2546819039651509323">"ഒരു മണിക്കൂർ"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> മണിക്കൂർ"</string>
-    <string name="minute" msgid="2486157997434653710">"ഒരു മിനിറ്റ്"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> മിനിറ്റ്"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ദിവസം</item>
+      <item quantity="one">1 ദിവസം</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> മണിക്കൂർ</item>
+      <item quantity="one">1 മണിക്കൂർ</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> മിനിറ്റ്</item>
+      <item quantity="one">ഒരു മിനിറ്റ്</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"എല്ലാ ദിവസവും"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"ഒരു ക്ലോക്ക് തിരഞ്ഞെടുക്കുക"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"ക്രമീകരണങ്ങൾ"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"സ്‌നൂസ് ചെയ്യൽ ദൈർഘ്യം"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> മിനിറ്റ്</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> മിനിറ്റ്</item>
       <item quantity="one">ഒരു മിനിറ്റ്</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">മിനിറ്റ്</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"ഇതിനുശേഷം നിശബ്‌ദമാക്കുക"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> മിനിറ്റ്"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> മിനിറ്റ്</item>
+      <item quantity="one">ഒരു മിനിറ്റ്</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"ഒരിക്കലുമില്ല"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"ഒരു മിനിറ്റ്"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> മണിക്കൂർ</item>
       <item quantity="one">ഒരു മണിക്കൂർ</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"അലാറം വിപുലീകരിക്കുക"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"അലാറം ചുരുക്കുക"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"പഴയപടിയാക്കുക"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"അലാറം ഇല്ലാതാക്കി."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"അലാറം ഇല്ലാതാക്കി"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"അടുത്ത അലാറം: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"അസാധുവായ സമയം <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>-ന് അലാറം ഒന്നുമില്ല"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"ഷെഡ്യൂൾ ചെയ്ത അലാറമുകളൊന്നുമില്ല"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"സ്റ്റോപ്പ്‌വാച്ച് ഇതിനകം തന്നെ പ്രവർത്തിക്കുന്നുണ്ട്"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"സ്റ്റോപ്പ്‌വാച്ച് പ്രവർത്തിക്കുന്നില്ല"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"സ്റ്റോപ്പ്‌വാച്ച് മോഡ് മാറ്റി"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"സജ്ജമാക്കിയ ടൈമറുകളൊന്നുമില്ല"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"ടൈമർ ഇല്ലാതാക്കി"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"ടൈമർ ഇതിനകം തന്നെ പ്രവർത്തിക്കുന്നു"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"അഭ്യർത്ഥന പൂർത്തിയാക്കാനാവുന്നില്ല, ഒന്നിലധികം ടൈമറുകൾ ലഭ്യം"</string>
+    <string name="timer_started" msgid="6715582052946641641">"ടൈമർ ആരംഭിച്ചു"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"ടൈമർ പുനഃസജ്ജമാക്കി"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"ടൈമർ ഇതിനകം തന്നെ പ്രവർത്തിക്കുന്നതിനാൽ, പുനഃസജ്ജമാക്കാൻ കഴിയില്ല. പുനഃസജ്ജമാക്കാൻ ടൈമർ നിർത്തുക."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"ടൈമർ ഇതിനകം തന്നെ നിർത്തി"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"നഗരം തിരഞ്ഞെടുത്തിട്ടില്ല"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"നിങ്ങൾ വ്യക്തമാക്കിയ നഗരം ലഭ്യമല്ല"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"ആ നഗരം ഇതിനകം തന്നെ ചേർത്തിട്ടുണ്ട്"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> ചേർത്തു"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> ഇല്ലാതാക്കി"</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>
+    <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>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index cfe3f96..1d4f657 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 өдөр"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> өдөр"</string>
-    <string name="hour" msgid="2546819039651509323">"1 цаг"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> цаг"</string>
-    <string name="minute" msgid="2486157997434653710">"1 минут"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> минут"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> өдөр</item>
+      <item quantity="one">1 өдөр</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> цаг</item>
+      <item quantity="one">1 цаг</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минут</item>
+      <item quantity="one">1 минут</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Өдөр бүр"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Цаг сонгох"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Тохиргоо"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Хойшлуулах хугацаа"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> минут</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минут</item>
       <item quantity="one">1 минут</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">минут</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Дуугүй болох"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> минут"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> минут</item>
+      <item quantity="one">1 минут</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Хэзээ ч үгүй"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 минут"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> цаг</item>
       <item quantity="one">1 цаг</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Сэрүүлгийг дэлгэх"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Сэрүүлгийг хумих"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"буцаах"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Сэрүүлэг устсан."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Сэрүүлэг устсан"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Дараагийн сэрүүлэг: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"цаг:мин"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"ӨДӨР, цаг:мин өглөө"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"ӨДӨР, цаг:мин"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Буруу цаг <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>-д тааруулсан сэрүүлэг байхгүй байна"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Хуваарьт сэрүүлэг байхгүй байна"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Секунд хэмжигч аль хэдийн ажиллаж байна"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Секунд хэмжигч ажиллахгүй байна"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Секунд хэмжигчийн горим өөрчлөгдсөн"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Цаг хэмжигч тохируулаагүй байна"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Цаг хэмжигчийг устгасан"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Цаг хэмжигч ажиллаж байна"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Таны хүсэлтийг биелүүлэх боломжгүй байна. Олон төрлийн цаг боломжтой байна"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Цаг хэмжигч эхэлсэн"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Цаг хэмжигчийг дахин эхлүүллээ"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Цаг хэмжигч ажиллаж байгаа учраас дахин эхлүүлэх боломжгүй байна. Цаг хэмжигчийг дахин тааруулахын тулд зогсооно уу."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Цаг хэмжигч зогссон байна"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Хот сонгоогүй байна"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Таны сонгосон хот байхгүй байна"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Энэ хотыг аль хэдийн нэмсэн"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> нэмсэн"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> устсан"</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>
+    <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>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index fa6e5b9..d2b0367 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 दिवस"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> दिवस"</string>
-    <string name="hour" msgid="2546819039651509323">"1 तास"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> तास"</string>
-    <string name="minute" msgid="2486157997434653710">"1 मिनिट"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> मिनिटे"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> दिवस</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> दिवस</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> तास</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> तास</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> मिनिट</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> मिनिटे</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"दररोज"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"एक घड्याळ निवडा"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"सेटिंग्ज"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"स्नूझ लांबी"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> मिनिट</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> मिनिटे</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> मिनिट</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> मिनिटे</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">मिनिट</item>
       <item quantity="other">मिनिटे</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"नंतर शांतता"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> मिनिटे"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> मिनिट</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> मिनिटे</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"कधीही नाही"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 मिनिट"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> तास</item>
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> तास</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"अलार्म विस्तृत करा"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"अलार्म संकुचित करा"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"पूर्ववत करा"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"अलार्म हटविला."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"अलार्म हटविला"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"पुढील अलार्म: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"अवैध वेळ <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g> चा कोणताही अलार्म नाही"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"अनुसूची केलेले अलार्म नाहीत"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"स्टॉपवॉच आधीपासून चालू आहे"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"स्टॉपवॉच चालू नाही"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"स्टॉपवॉच मोड बदलला"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"टायमर सेट केले नाही"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"टायमर हटविला"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"टायमर आधीपासून चालू आहे"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"आपली विनंती पूर्ण करण्‍यात अक्षम, एकाधिक टायमर उपलब्‍ध आहेत"</string>
+    <string name="timer_started" msgid="6715582052946641641">"टायमर सुरू झाला"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"टायमर रीसेट केला"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"टायमर अद्याप चालू असल्याने तो रीसेट केला जाऊ शकत नाही. रीसेट करण्‍यासाठी टायमर थांबवा."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"टायमर आधीपासून थांबला आहे"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"कोणतेही शहर निवडले नाही"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"आपण निर्दिष्‍ट केलेले शहर उपलब्‍ध नाही"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"ते शहर आधीपासून जोडले गेले आहे"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> जोडले"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> हटविले"</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>
+    <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>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 3af6d65..26e8000 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Penggera ditetapkan pada <xliff:g id="HOURS">%2$s</xliff:g> dan <xliff:g id="MINUTES">%3$s</xliff:g> dari sekarang."</item>
     <item msgid="2332583385137381060">"Penggera ditetapkan untuk <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> dan <xliff:g id="MINUTES">%3$s</xliff:g> dari sekarang."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 hari"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> hari"</string>
-    <string name="hour" msgid="2546819039651509323">"1 jam"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> jam"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minit"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minit"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> hari</item>
+      <item quantity="one">1 hari</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> jam</item>
+      <item quantity="one">1 jam</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minit</item>
+      <item quantity="one">1 minit</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Setiap hari"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Pilih jam"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Tetapan"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Tempoh tunda"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minit</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minit</item>
       <item quantity="one">1 minit</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minit</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Senyap selepas"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minit"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minit</item>
+      <item quantity="one">1 minit</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Jangan sekali-kali"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minit"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Masa saya ialah <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Masa pusingan:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Pusingan <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> jam</item>
       <item quantity="one">1 jam</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Kembangkan penggera"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Runtuhkan penggera"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"buat asal"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Penggera dikesan."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Penggera dikesan"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Penggera seterusnya: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Tiada penggera yang dijadualkan"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Jam randik sudah berjalan"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Jam randik tidak berjalan"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Mod jam randik ditukar"</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Penggera <xliff:g id="ALARM_TIME">%s</xliff:g> diketepikan"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Tiada pemasa yang ditetapkan"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Pemasa dipadamkan"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Pemasa sudah berjalan"</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"Pemasa dimulakan"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Tetapkan semula pemasa"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Pemasa tidak boleh ditetapkan semula kerana masih berjalan. Hentikan pemasa untuk menetapkan semula."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Pemasa sudah berhenti"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Tiada bandar dipilih"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Bandar yang anda nyatakan tidak tersedia"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Bandar itu telah ditambahkan"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> ditambahkan"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> dipadamkan"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Penggera <xliff:g id="ALARM_TIME">%s</xliff:g> belum boleh diketepikan lagi, masih ada lebih 24 jam sebelum penggera itu berbunyi"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Ketepikan penggera"</string>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Tiada penggera yang berbunyi"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Penggera <xliff:g id="ALARM_TIME">%s</xliff:g> ditunda selama 10 minit"</string>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 49c4328..ed51115 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"၁ ရက်"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> ရက်"</string>
-    <string name="hour" msgid="2546819039651509323">"၁ နာရီ"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> နာရီ"</string>
-    <string name="minute" msgid="2486157997434653710">"၁ မိနစ်"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> မိနစ်"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ရက်</item>
+      <item quantity="one">1 ရက်</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> နာရီ</item>
+      <item quantity="one"> ၁ နာရီ</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> မိနစ်</item>
+      <item quantity="one"> ၁ မိနစ်</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"နေ့တိုင်း"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"နာရီ တစ်ခုကို ရွေးရန်"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"ဆက်တင်များ"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"မှေးစက်ကာလ"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> မိနစ်</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> မိနစ်</item>
       <item quantity="one">၁ မိနစ်</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">မိနစ်</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"နှိုးစက်သံကြာချိန်"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> မိနစ်"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> မိနစ်</item>
+      <item quantity="one"> ၁ မိနစ်</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"မည်သည့်အခါမှ"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"၁ မိနစ်"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> နာရီ</item>
       <item quantity="one">၁ နာရီ</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"နှိုးစက်ကို တိုးချဲ့ရန်"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"နှိုးစက်ကို ခေါက်သိမ်းပါ"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"ပြန်ဖျက်"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"နှိုးစက် ရှာတွေ့ခဲ့သည်။"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"နိုးစက်ဖျက်လိုက်ပြီ"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"နောက် နှိုးစက် တစ်ခု: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE၊ h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE၊ k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"အချိန် မမှန်ကန်ပါ <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g> တွင် နှိုးစက် မရှိပါ"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"စီစဉ်ထားသည့် နိုးစက်မရှိပါ"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"အချိန်မှတ်နာရီ ဖွင့်ထားပြီးဖြစ်သည်"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"အချိန်မှတ်နာရီ မဖွင့်ထားပါ"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"အချိန်မှတ်နာရီမုဒ် ပြောင်းလိုက်ပြီ"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"အချိန်တိုင်းစက် မသတ်မှတ်ရသေးပါ"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"အချိန်သတ်မှတ်ခြင်း ဖျက်လိုက်ပါပြီ"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"အချိန်သတ်မှတ်ခြင်း ဖွင့်ထားပြီးပါပြီ"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"သင့်တောင်းဆိုချက် မပြီးမြောက်နိုင်ပါ၊ အချိန်တိုင်းစက် များစွာ ရှိနေ၏"</string>
+    <string name="timer_started" msgid="6715582052946641641">"တိုင်မားစတင်ပါပြီ"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"အချိန်သတ်မှတ်ခြင်း ပြန်လည်သတ်မှတ်လိုက်ပါပြီ"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"အချိန်သတ်မှတ်ခြင်း ဖွင့်ထားသောကြောင့် ပြန်လည်သတ်မှတ်၍မရပါ။ ပြန်လည်သတ်မှတ်ရန် အချိန်သတ်မှတ်ခြင်းကို ရပ်ပါ။"</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"အချိန်သတ်မှတ်ခြင်း ရပ်ထားပါပြီ"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"မြို့မရွေးချယ်ထားပါ"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"သင်သတ်မှတ်သည့် မြို့တော် မရှိသေးပါ"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"၎င်းမြို့တော်ကို ပေါင်းထည့်ပြီးပါပြီ"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> ပေါင်းထည့်ပြီးပြီ"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> ဖျက်လိုက်ပါပြီ"</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>
+    <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>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 3e2dbe6..491ab3e 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Alarmen ringer om <xliff:g id="HOURS">%2$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
     <item msgid="2332583385137381060">"Alarmen ringer om <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>."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 dag"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> dager"</string>
-    <string name="hour" msgid="2546819039651509323">"1 time"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> timer"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minutt"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutter"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dager</item>
+      <item quantity="one">1 dag</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> timer</item>
+      <item quantity="one">1 time</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutter</item>
+      <item quantity="one">1 minutt</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Hver dag"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Velg en klokke"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Innstillinger"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Slumretid"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutter</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutter</item>
       <item quantity="one">1 minutt</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minutt</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Slå av etter"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutter</item>
+      <item quantity="one">1 minutt</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Aldri"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minutt"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Tiden min er <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Rundetider:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Runde <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> timer</item>
       <item quantity="one">1 time</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Vis alarmen"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Skjul alarmen"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"angre"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarmen ble slettet."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarmen ble slettet"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Neste alarm: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"HH:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE – HH:mm"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Ugyldig tid <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Ingen alarm kl. <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Ingen alarmer er angitt"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Stoppeklokken er allerede aktiv"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Stoppeklokken er ikke aktiv"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Modusen for stoppeklokken er endret"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Ingen alarm er angitt for dette tidspunktet"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Alarmen <xliff:g id="ALARM_TIME">%s</xliff:g> er fjernet"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Ingen tidtaker er angitt"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Tidtakeren er slettet"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"En tidtaker er allerede aktiv"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Kunne ikke fullføre forespørselen – flere tidtakere er tilgjengelige"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Tidtakeren er startet"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Tidtakeren er tilbakestilt"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Tidtakeren kan ikke tilbakestilles fordi den er aktiv. Stopp tidtakeren for å tilbakestille."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Tidtakeren er allerede stoppet"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Ingen by er valgt"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Byen du har angitt, er ikke tilgjengelig"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Den byen er allerede lagt til"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> er lagt til"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> er slettet"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Alarmen <xliff:g id="ALARM_TIME">%s</xliff:g> kan ikke fjernes ennå – tidspunktet er fortsatt over 24 timer frem i tid"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Slå av alarm"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Velg hvilken alarm du vil fjerne"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Ingen alarmer ringer nå"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Alarmen <xliff:g id="ALARM_TIME">%s</xliff:g> slumrer i ti minutter"</string>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 091302a..c5c7340 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"१ दिन"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> दिन"</string>
-    <string name="hour" msgid="2546819039651509323">"१ घन्टा"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> घन्टा"</string>
-    <string name="minute" msgid="2486157997434653710">"१ मिनेट"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> मिनेट"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> दिन</item>
+      <item quantity="one">१ दिन</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> घन्टा</item>
+      <item quantity="one"> १ घण्टा</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> मिनेट</item>
+      <item quantity="one"> १ मिनेट</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"प्रत्येक दिन"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"घडी छान्नुहोस्"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"सेटिङहरू"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"स्नुज लम्बाइ"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> मिनेट</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> मिनेट</item>
       <item quantity="one">1 मिनेट</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">मिनेट</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"यस पछि मौन"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> मिनेट"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> मिनेट</item>
+      <item quantity="one"> १ मिनेट</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"कहिले पनि होइन"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"१ मिनेट"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> घण्टा</item>
       <item quantity="one">1 घण्टा</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"अलार्म विस्तार गर्नुहोस्"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"अलार्म ढाल्नुहोस्"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"पूर्ववत गर्नुहोस्"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"अलार्म मेटाइयो"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"अलार्म मेटाइयो"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"\"<xliff:g id="LABEL">%s</xliff:g>\""</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"अर्को अलार्म: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"अमान्य समय <xliff:g id="INVALID_HOUR">%d</xliff:g> : <xliff:g id="INVALID_MINUTES">%d</xliff:g><xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g> : <xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>मा कुनै अलार्म छैन"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"कुनै मिलाइएको कार्यतालिका अलार्म छैन"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"स्टपवाच पहिले नै चलिरहेको छ"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"स्टपवाच चलिरहेको छैन"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"स्टपवाच मोड परिवर्तन भयो"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"कुनै घडी सेट भएको छैन"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"घडी मेटियो"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"घडी पहिले नै चलिरहेको छ"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"तपाईँको अनुरोध सम्पन्न गर्न असमर्थ, धेरै घडीहरू उपलब्ध छन्"</string>
+    <string name="timer_started" msgid="6715582052946641641">"घडी सुरु भयो"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"घडी रिसेट गरियो"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"यो अझै चलिरहेका कारणले घडी रिसेट हुन सक्दैन। रिसेट गर्न घडी रोक्नुहोस्।"</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"घडी पहिले नै रोकियो"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"कुनै सहर चयन गरिएको छैन"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"तपाईँ निर्दिष्ट गरेको सहर उपलब्ध छैन"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"त्यो सहर पहिले नै थप गरिएको छ"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> थपियो"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> मेटियो"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"<xliff:g id="ALARM_TIME">%s</xliff:g> अलार्म अझै खारेज गर्न सक्दैन, अझै २४ घन्टाभन्दा बढी छ"</string>
+    <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> अलार्म १० मिनेटका लागि  स्नुज गरियो"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2885a36..cab84af 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Alarm gaat over <xliff:g id="HOURS">%2$s</xliff:g> en <xliff:g id="MINUTES">%3$s</xliff:g> af."</item>
     <item msgid="2332583385137381060">"Alarm is ingesteld voor <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> en <xliff:g id="MINUTES">%3$s</xliff:g> vanaf nu."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 dag"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> dagen"</string>
-    <string name="hour" msgid="2546819039651509323">"1 uur"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> uur"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minuut"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minuten"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dagen</item>
+      <item quantity="one">1 dag</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> uur</item>
+      <item quantity="one">1 uur</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuten</item>
+      <item quantity="one">1 minuut</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Elke dag"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Een klok selecteren"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Instellingen"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Snoozeduur"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minuten</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuten</item>
       <item quantity="one">1 minuut</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minuut</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Stil na"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minuten"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minuten</item>
+      <item quantity="one">1 minuut</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Nooit"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minuut"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Mijn tijd is <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Rondetijden:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Ronde <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"Nr. <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"Nr. <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> uur</item>
       <item quantity="one">1 uur</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Alarm uitvouwen"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Alarm samenvouwen"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"ongedaan maken"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Verwijderd."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarm verwijderd"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Volgend alarm: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Ongeldige tijd <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Geen alarm om <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Geen geplande alarmen"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Stopwatch loopt al"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Stopwatch loopt niet"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Stopwatchmodus gewijzigd"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Geen alarm gepland op deze tijd"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"<xliff:g id="ALARM_TIME">%s</xliff:g> alarm gesloten"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Geen timer ingesteld"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Timer verwijderd"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Timer loopt al"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Uw verzoek kan niet worden voltooid. Er zijn meerdere timers beschikbaar."</string>
+    <string name="timer_started" msgid="6715582052946641641">"Timer gestart"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Timer gereset"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"De timer kan niet worden gereset omdat deze nog loopt. Stop de timer om deze te resetten."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Timer is al gestopt"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Geen plaats geselecteerd"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"De opgegeven plaats is niet beschikbaar"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Deze plaats is al toegevoegd"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> toegevoegd"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> verwijderd"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"<xliff:g id="ALARM_TIME">%s</xliff:g> alarm kan nog niet worden gesloten omdat het over meer dan 24 uur afgaat"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Alarm sluiten"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Kiezen welk alarm u wilt sluiten"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Geen actieve alarmen"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"<xliff:g id="ALARM_TIME">%s</xliff:g> alarm tien minuten gesnoozed"</string>
 </resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 1f39116..2487a43 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 ਦਿਨ"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> ਦਿਨ"</string>
-    <string name="hour" msgid="2546819039651509323">"1 ਘੰਟਾ"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> ਘੰਟੇ"</string>
-    <string name="minute" msgid="2486157997434653710">"1 ਮਿੰਟ"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> ਮਿੰਟ"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ਦਿਨ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ਦਿਨ</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ਘੰਟੇ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ਘੰਟੇ</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ਮਿੰਟ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ਮਿੰਟ</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"ਰੁਜ਼ਾਨਾ"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"ਇੱਕ ਘੜੀ ਚੁਣੋ"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"ਸਨੂਜ਼ ਲੰਮਾਈ"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ਮਿੰਟ</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ਮਿੰਟ</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ਮਿੰਟ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ਮਿੰਟ</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">ਮਿੰਟ</item>
       <item quantity="other">ਮਿੰਟ</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"ਇਸਤੋਂ ਬਾਅਦ ਸਾਈਲੈਂਸ"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> ਮਿੰਟ"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> ਮਿੰਟ</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> ਮਿੰਟ</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"ਕਦੇ ਵੀ ਨਹੀਂ"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 ਮਿੰਟ"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ਘੰਟੇ</item>
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ਘੰਟੇ</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"ਅਲਾਰਮ ਦਾ ਵਿਸਤਾਰ ਕਰੋ"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"ਅਲਾਰਮ ਨਸ਼ਟ ਕਰੋ"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"ਪਹਿਲਾਂ ਵਰਗਾ ਕਰੋ"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"ਅਲਾਰਮ ਮਿਟਾਇਆ।"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"ਅਲਾਰਮ ਮਿਟਾਇਆ"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"ਅਗਲਾ ਅਲਾਰਮ: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"ਅਪ੍ਰਮਾਣਿਕ ਸਮਾਂ <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g> ਤੇ ਕੋਈ ਅਲਾਰਮ ਨਹੀਂ"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"ਕੋਈ ਨਿਯਤ ਕੀਤੇ ਅਲਾਰਮ ਨਹੀਂ"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"ਸਟੌਪਵੌਚ ਪਹਿਲਾਂ ਹੀ ਚੱਲ ਰਹੀ ਹੈ"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"ਸਟੌਪਵੌਚ ਨਹੀਂ ਚੱਲ ਰਹੀ ਹੈ"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"ਸਟੌਪਵੌਚ ਮੋਡ ਬਦਲਿਆ"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"ਕੋਈ ਟਾਈਮਰ ਸੈਟ ਨਹੀਂ ਕੀਤਾ"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"ਟਾਈਮਰ ਮਿਟਾਇਆ ਗਿਆ"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"ਟਾਈਮਰ ਪਹਿਲਾਂ ਹੀ ਚੱਲ ਰਿਹਾ ਹੈ"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"ਤੁਹਾਡੀ ਬੇਨਤੀ ਨੂੰ ਪੂਰਾ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ, ਮਲਟੀਪਲ ਟਾਈਮਰ ਉਪਲਬਧ ਹਨ"</string>
+    <string name="timer_started" msgid="6715582052946641641">"ਟਾਈਮਰ ਸ਼ੁਰੂ ਹੋਇਆ"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"ਟਾਈਮਰ ਰੀਸੈਟ ਕੀਤਾ"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"ਟਾਈਮਰ ਰੀਸੈਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਕਿਉਂਕਿ ਇਹ ਹੁਣ ਵੀ ਚੱਲ ਰਿਹਾ ਹੈ। ਰੀਸੈਟ ਕਰਨ ਲਈ ਟਾਈਮਰ ਰੋਕੋ।"</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"ਟਾਈਮਰ ਪਹਿਲਾਂ ਹੀ ਰੋਕਿਆ ਗਿਆ"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"ਕੋਈ ਸ਼ਹਿਰ ਨਹੀਂ ਚੁਣਿਆ ਗਿਆ"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਨਿਰਦਿਸ਼ਟ ਕੀਤਾ ਸ਼ਹਿਰ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"ਉਹ ਸ਼ਹਿਰ ਪਹਿਲਾਂ ਹੀ ਜੋੜਿਆ ਗਿਆ ਹੈ"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> ਜੋੜਿਆ ਗਿਆ"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> ਮਿਟਾਇਆ ਗਿਆ"</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>
+    <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>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c7dd64b..693b3dd 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -77,12 +77,24 @@
     <item msgid="9115697840826129603">"Alarm włączy się za <xliff:g id="HOURS">%2$s</xliff:g> i <xliff:g id="MINUTES">%3$s</xliff:g>"</item>
     <item msgid="2332583385137381060">"Alarm włączy się za <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> i <xliff:g id="MINUTES">%3$s</xliff:g>"</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 dzień"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> dni"</string>
-    <string name="hour" msgid="2546819039651509323">"1 godz."</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> godz."</string>
-    <string name="minute" msgid="2486157997434653710">"1 min"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> min"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> dni</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> dni</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dnia</item>
+      <item quantity="one">1 dzień</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> godziny</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> godzin</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> godziny</item>
+      <item quantity="one">1 godzina</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minuty</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> minut</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuty</item>
+      <item quantity="one">1 minuta</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Codziennie"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Wybierz zegar."</string>
@@ -91,9 +103,9 @@
     <string name="settings" msgid="5849739030579520686">"Ustawienia"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Długość drzemki"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> minuty</item>
-      <item quantity="many"><xliff:g id="NUMBER">%d</xliff:g> minut</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minuty</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minuty</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> minut</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuty</item>
       <item quantity="one">1 minuta</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -103,7 +115,12 @@
       <item quantity="one">minuta</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Wycisz za"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> min"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="few"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minuty</item>
+      <item quantity="many"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minut</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minuty</item>
+      <item quantity="one">1 minuta</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Nigdy"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minuta"</item>
@@ -180,6 +197,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Mój czas to <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Czasy okrążeń:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Okrążenie <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"<xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> godziny</item>
       <item quantity="many"><xliff:g id="NUMBER">%d</xliff:g> godzin</item>
@@ -345,7 +366,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Rozwiń alarm"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Zwiń alarm"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"cofnij"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarm usunięty."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarm usunięty"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Następny alarm: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -367,4 +388,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Nieprawidłowa godzina <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Brak alarmu o <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Brak zaplanowanych alarmów"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Stoper jest już uruchomiony"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Stoper nie jest uruchomiony"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Tryb stopera zmieniony"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Na tę godzinę nie ma żadnego alarmu"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Alarm na <xliff:g id="ALARM_TIME">%s</xliff:g> został zamknięty"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Minutnik nie jest ustawiony"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Minutnik został usunięty"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Minutnik jest już uruchomiony"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Nie można zrealizować żądania, bo dostępnych jest kilka stoperów"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Minutnik został uruchomiony"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Minutnik został zresetowany"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Nie można zresetować minutnika, bo wciąż jest uruchomiony. Najpierw go zatrzymaj."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Minutnik jest już zatrzymany"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Nie wybrałeś miasta"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Podane miasto jest niedostępne"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"To miasto zostało już dodane"</string>
+    <string name="city_added" msgid="1335509457349179514">"Dodano: <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Usunięto: <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Alarmu na <xliff:g id="ALARM_TIME">%s</xliff:g> nie można jeszcze zamknąć, bo włączy się dopiero za ponad 24 godziny"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Anuluj alarm"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Wybierz, który alarm wyłączyć"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Brak aktualnych alarmów"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Alarm z <xliff:g id="ALARM_TIME">%s</xliff:g> został uśpiony na 10 minut"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9fe5904..b436089 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Alarme definido para daqui a <xliff:g id="HOURS">%2$s</xliff:g> e <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
     <item msgid="2332583385137381060">"Alarme definido para daqui a <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> e <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 dia"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> dias"</string>
-    <string name="hour" msgid="2546819039651509323">"1 hora"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> horas"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minuto"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutos"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dias</item>
+      <item quantity="one">1 dia</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
+      <item quantity="one">1 hora</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
+      <item quantity="one">1 minuto</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Todos os dias"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Escolha um relógio"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Definições"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Duração da suspensão"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutos</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
       <item quantity="one">1 minuto</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minuto</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Silenciar depois de"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutos"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutos</item>
+      <item quantity="one">1 minuto</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Nunca"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minuto"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"O meu tempo é <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Tempos de volta:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Volta <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"N.º <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"N.º <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> horas</item>
       <item quantity="one">1 hora</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Expandir alarme"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Reduzir alarme"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"anular"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Despertador apagado"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Despertador eliminado"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Próximo alarme: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Hora inválida <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Nenhum alarme às <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Nenhum alarme programado"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"O cronómetro já está a ser executado"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"O cronómetro não está a ser executado"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Modo de cronómetro alterado"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Nenhum alarme programado para esta hora"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Alarme das <xliff:g id="ALARM_TIME">%s</xliff:g> ignorado"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Nenhum temporizador definido"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Temporizador eliminado"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"O temporizador já está a ser executado"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Não foi possível concluir o pedido. Estão disponíveis vários temporizadores"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Temporizador iniciado"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Temporizador reposto"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Não é possível repor o temporizador porque ainda está a ser executado. Pare-o para o repor."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"O temporizador já foi parado"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Nenhuma cidade selecionada"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"A cidade especificada não está disponível"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Essa cidade já foi adicionada"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> adicionado(a)"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> eliminado(a)"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Ainda não é possível ignorar o alarme das <xliff:g id="ALARM_TIME">%s</xliff:g>, pois ocorre num período posterior a 24 horas"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Ignorar alarme"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Selecionar o alarme a ignorar"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Nenhum alarme acionado"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Alarme das <xliff:g id="ALARM_TIME">%s</xliff:g> suspenso durante 10 minutos"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d22e665..5ff3936 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Alarme definido para <xliff:g id="HOURS">%2$s</xliff:g> e <xliff:g id="MINUTES">%3$s</xliff:g> a partir de agora."</item>
     <item msgid="2332583385137381060">"Alarme definido para <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> e <xliff:g id="MINUTES">%3$s</xliff:g> a partir de agora."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 dia"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> dias"</string>
-    <string name="hour" msgid="2546819039651509323">"1 hora"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> horas"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minuto"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutos"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> dias</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dias</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Todos os dias"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Escolha um relógio"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"Configurações"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Duração da soneca"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> minutes</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutos</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">minutes</item>
       <item quantity="other">minutos</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Silenciar depois de"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutos"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutos</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutos</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Nunca"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minuto"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Meu tempo é <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Tempos de volta:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Volta <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"Nº <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"Nº <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> hours</item>
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> horas</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Expandir alarme"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Recolher alarme"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"desfazer"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarme excluído."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarme excluído"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Próximo alarme: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Hora inválida <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Nenhum alarme às <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Nenhum alarme programado"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"O cronômetro já está sendo executado"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"O cronômetro não está em execução"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Modo cronômetro alterado"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Nenhum alarme programado para este horário"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Alarme <xliff:g id="ALARM_TIME">%s</xliff:g> dispensado"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Nenhum timer definido"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Timer excluído"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Timer já em execução"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Não foi possível concluir a solicitação. Há vários timers disponíveis"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Timer iniciado"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Timer redefinido"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Não é possível redefinir o timer porque ele ainda está em execução. Pare o timer para redefini-lo."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Timer já parado"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Nenhuma cidade selecionada"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"A cidade especificada não está disponível"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Esta cidade já foi adicionada"</string>
+    <string name="city_added" msgid="1335509457349179514">"Cidade adicionada: <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Cidade excluída: <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Não é possível dispensar o alarme <xliff:g id="ALARM_TIME">%s</xliff:g> ainda, pois ainda faltam mais de 24 horas para ele"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Dispensar alarme"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Escolher qual alarme dispensar"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Nenhum alarme disparando"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Alarme <xliff:g id="ALARM_TIME">%s</xliff:g> adiado por 10 minutos"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index f9727d1..0d9ee8c 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -75,12 +75,21 @@
     <item msgid="9115697840826129603">"Alarmă setată peste <xliff:g id="HOURS">%2$s</xliff:g> și <xliff:g id="MINUTES">%3$s</xliff:g> din acest moment."</item>
     <item msgid="2332583385137381060">"Alarmă setată peste <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> și <xliff:g id="MINUTES">%3$s</xliff:g> din acest moment."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 zi"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> (de) zile"</string>
-    <string name="hour" msgid="2546819039651509323">"1 oră"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> (de) ore"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minut"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minute"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> zile</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> de zile</item>
+      <item quantity="one">O zi</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> ore</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> de ore</item>
+      <item quantity="one">O oră</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> de minute</item>
+      <item quantity="one">Un minut</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"În fiecare zi"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Alegeţi un ceas"</string>
@@ -89,8 +98,8 @@
     <string name="settings" msgid="5849739030579520686">"Setări"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Durata amânării"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> minute</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> de minute</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> de minute</item>
       <item quantity="one">Un minut</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -99,7 +108,11 @@
       <item quantity="one">minut</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Dezactivare după"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> (de) minute"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="few"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> de minute</item>
+      <item quantity="one">Un minut</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Niciodată"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"Un minut"</item>
@@ -176,6 +189,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Ora mea este <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Timpi circuit:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Circuitul <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"<xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> ore</item>
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> de ore</item>
@@ -338,7 +355,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Extindeţi alarma"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Restrângeţi alarma"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"anulaţi"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarma a fost ştearsă."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarma a fost ştearsă"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/<xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Alarma următoare: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -359,4 +376,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Nicio alarmă programată"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Cronometrul este pornit deja"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Cronometrul nu este pornit"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Modul cronometrului a fost schimbat"</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Alarma de la <xliff:g id="ALARM_TIME">%s</xliff:g> a fost închisă"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Niciun temporizator setat"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Temporizatorul a fost șters"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Temporizatorul este pornit deja"</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"Temporizatorul a fost pornit"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Temporizatorul a fost resetat"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Temporizatorul nu poate fi resetat, deoarece încă este pornit. Opriți temporizatorul pentru a-l reseta."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Temporizatorul este oprit deja"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Niciun oraș selectat"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Orașul pe care l-ați specificat nu este disponibil"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Orașul a fost adăugat deja"</string>
+    <string name="city_added" msgid="1335509457349179514">"Orașul <xliff:g id="CITY_NAME">%s</xliff:g> a fost adăugat"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Orașul <xliff:g id="CITY_NAME">%s</xliff:g> a fost șters"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Alarma de la <xliff:g id="ALARM_TIME">%s</xliff:g> nu poate fi închisă încă, deoarece este setată peste mai mult de 24 de ore"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Închideți alarma"</string>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Nicio alarmă activată"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Alarma de la <xliff:g id="ALARM_TIME">%s</xliff:g> a fost amânată cu 10 minute"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a48b143..66100f4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -77,12 +77,24 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 день"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> дн."</string>
-    <string name="hour" msgid="2546819039651509323">"1 ч."</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> ч."</string>
-    <string name="minute" msgid="2486157997434653710">"1 мин."</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> мин."</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> день</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> дня</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> дней</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> дня</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> час</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> часа</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> часов</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> часа</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> минута</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> минуты</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> минут</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минуты</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Каждый день"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Выберите часы"</string>
@@ -91,10 +103,10 @@
     <string name="settings" msgid="5849739030579520686">"Настройки"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Интервал повтора сигнала"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> минута</item>
-      <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> минуты</item>
-      <item quantity="many"><xliff:g id="NUMBER">%d</xliff:g> минут</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> минуты</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> минута</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> минуты</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> минут</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минуты</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">минуты</item>
@@ -103,7 +115,12 @@
       <item quantity="other">минуты</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Автовыключение"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> мин."</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> минута</item>
+      <item quantity="few"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> минуты</item>
+      <item quantity="many"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> минут</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> минуты</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Отключено"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 минута"</item>
@@ -180,6 +197,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"<xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> час</item>
       <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> часа</item>
@@ -345,7 +366,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Развернуть"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Свернуть"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"отмена"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Будильник удален"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Будильник удален"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/<xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Следующий будильник: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -367,4 +388,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Время (<xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>) указано неверно"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"На <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g> не установлено ни одного будильника"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Будильники не установлены"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Секундомер уже запущен"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Секундомер не запущен"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Режим секундомера изменен"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Таймер не установлен"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Таймер удален"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Таймер уже запущен"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Не удалось обработать запрос, так как таймеров несколько"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Таймер запущен"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Таймер сброшен"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Чтобы сбросить таймер, сначала остановите его."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Таймер уже остановлен"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Город не выбран"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Не удалось найти такой город"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Такой город уже добавлен"</string>
+    <string name="city_added" msgid="1335509457349179514">"Город добавлен (<xliff:g id="CITY_NAME">%s</xliff:g>)"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Город удален (<xliff:g id="CITY_NAME">%s</xliff:g>)"</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>
+    <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>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index b7de571..83ddb12 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"දවස් 1 ක්"</string>
-    <string name="days" msgid="2070509222727852210">"දවස් <xliff:g id="DAYS">%s</xliff:g>"</string>
-    <string name="hour" msgid="2546819039651509323">"පැය 1"</string>
-    <string name="hours" msgid="2071487018566991613">"පැය <xliff:g id="HOURS">%s</xliff:g>"</string>
-    <string name="minute" msgid="2486157997434653710">"මිනිත්තු 1"</string>
-    <string name="minutes" msgid="6115838729146292526">"මිනිත්තු <xliff:g id="MINUTES">%s</xliff:g>"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one">දින <xliff:g id="NUMBER">%s</xliff:g></item>
+      <item quantity="other">දින <xliff:g id="NUMBER">%s</xliff:g></item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one">පැය <xliff:g id="NUMBER">%s</xliff:g></item>
+      <item quantity="other">පැය <xliff:g id="NUMBER">%s</xliff:g></item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one">මිනිත්තු <xliff:g id="NUMBER">%s</xliff:g></item>
+      <item quantity="other">මිනිත්තු <xliff:g id="NUMBER">%s</xliff:g></item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"සෑමදාම"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"ඔරලෝසුවක් තෝරන්න"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"සැකසුම්"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"යළි සිහිකැඳවන දිග"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one">මිනිත්තු <xliff:g id="NUMBER">%d</xliff:g></item>
-      <item quantity="other">මිනිත්තු <xliff:g id="NUMBER">%d</xliff:g></item>
+      <item quantity="one">මිනිත්තු <xliff:g id="NUMBER">%s</xliff:g></item>
+      <item quantity="other">මිනිත්තු <xliff:g id="NUMBER">%s</xliff:g></item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">මිනිත්තු</item>
       <item quantity="other">මිනිත්තු</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"නිහඬවන්නෙ පසු"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"මිනිත්තු <xliff:g id="MINUTES">%d</xliff:g>"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one">මිනිත්තු <xliff:g id="FORMATTED_NUMBER">%s</xliff:g></item>
+      <item quantity="other">මිනිත්තු <xliff:g id="FORMATTED_NUMBER">%s</xliff:g></item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"කවදාවත් නොවේ"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"මිනිත්තු 1"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one">පැය <xliff:g id="NUMBER">%d</xliff:g></item>
       <item quantity="other">පැය <xliff:g id="NUMBER">%d</xliff:g></item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"ඇඟවීම දිග හරින්න"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"ඇඟවීම අකුලන්න"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"අස් කරන්න"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"ඇඟවීම මකාදැමිණි."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"එලාමය නොමකන ලදී"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"මීළඟ ඇඟවීම: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"වලංගු නොවන වේලාව <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g> ට සීනු නොමැත"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"කාල සටහන්ගත කළ එලාම නැත"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"විරාම ඝටිකාව දැනටමත් ධාවනය වේ"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"විරාම ඝටිකාව ධාවනය නොවේ"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"විරාම ඝටිකා ප්‍රකාරය වෙනස් කරන ලදී"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"ටයිමරය සකසා නැත"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"ටයිමරය මකන ලදී"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"ටයිමරය දැනටමත් ධාවනය වේ"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"ඔබගේ ඉල්ලීම සම්පූර්ණ කිරීමට නොහැකි විය, ටයිමර කිහිපයක් ඇත"</string>
+    <string name="timer_started" msgid="6715582052946641641">"ටයිමරය ආරම්භ කරන ලදී"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"ටයිමරය යළි සකසන ලදී"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"ටයිමරය තවම ධාවනය වන බැවින් එය යළි සැකසීමට නොහැකිය. යළි සැකසීමට ටයිමරය නවත්වන්න."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"ටයිමරය දැනටමත් නතර කර ඇත"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"නගරය තෝරා නොමැත"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"ඔබ නිශ්චිතව දක්වන ලද නගරය ලබා ගත නොහැකිය"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"එම නගරය දැනටමත් එක් කර ඇත"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> එක් කරන ලදී"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> මකන ලදී"</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>
+    <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>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 64f58bb..b1a54ec 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -77,12 +77,24 @@
     <item msgid="9115697840826129603">"Budík sa spustí o <xliff:g id="HOURS">%2$s</xliff:g> a <xliff:g id="MINUTES">%3$s</xliff:g>"</item>
     <item msgid="2332583385137381060">"Budík sa spustí o <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> a <xliff:g id="MINUTES">%3$s</xliff:g>"</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 deň"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> d."</string>
-    <string name="hour" msgid="2546819039651509323">"1 hodina"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> h"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minúta"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> min"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> dni</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> dňa</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dní</item>
+      <item quantity="one">1 deň</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> hodiny</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> hodiny</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> hodín</item>
+      <item quantity="one">1 hodina</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minúty</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> minúty</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minút</item>
+      <item quantity="one">1 minúta</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"každý deň"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Zvoľte hodiny"</string>
@@ -91,9 +103,9 @@
     <string name="settings" msgid="5849739030579520686">"Nastavenia"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Dĺžka odloženia zvonenia"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> minúty</item>
-      <item quantity="many"><xliff:g id="NUMBER">%d</xliff:g> minúty</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minút</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minúty</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> minúty</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minút</item>
       <item quantity="one">1 minúta</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -103,7 +115,12 @@
       <item quantity="one"> minúta</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Stíšiť po uplynutí"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> min"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="few"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minúty</item>
+      <item quantity="many"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minúty</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minút</item>
+      <item quantity="one">1 minúta</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Nikdy"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minúta"</item>
@@ -180,6 +197,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Môj čas je <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Intervalové časy:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. etapa"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"Č. <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"Č. <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> hodiny</item>
       <item quantity="many"><xliff:g id="NUMBER">%d</xliff:g> hodiny</item>
@@ -345,7 +366,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Rozbaliť budík"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Zbaliť budík"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"späť"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Budík bol odstránený"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Budík bol odstránený"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Ďalší budík: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -367,4 +388,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Neplatný čas <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Žiadny budík na <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Žiadne nastavené budíky"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Stopky sú už spustené"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Stopky nie sú spustené"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Režim stopiek bol zmenený"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Na tento čas nie je nastavený žiadny budík"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Budík na <xliff:g id="ALARM_TIME">%s</xliff:g> bol odmietnutý"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Nie je nastavený žiadny časovač"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Časovač bol odstránený"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Časovač je už spustený"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Vašu žiadosť sa nepodarilo dokončiť, pretože je k dispozícii viacero časovačov"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Časovač bol spustený"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Časovač bol resetovaný"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Časovač sa nedá resetovať, pretože je stále spustený. Najprv ho zastavte."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Časovač už bol zastavený"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Nebolo vybraté mesto"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Zadané mesto nie je k dispozícii"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Dané mesto už bolo pridané"</string>
+    <string name="city_added" msgid="1335509457349179514">"Mesto <xliff:g id="CITY_NAME">%s</xliff:g> bolo pridané"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Mesto <xliff:g id="CITY_NAME">%s</xliff:g> bolo odstránené"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Budík na <xliff:g id="ALARM_TIME">%s</xliff:g> sa ešte nedá odmietnuť, pretože sa má aktivovať až o viac ako 24 hodín."</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Zrušiť budík"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Vyberte budík, ktorý chcete odmietnuť"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Žiadne aktívne budíky"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Budík na <xliff:g id="ALARM_TIME">%s</xliff:g> bol odložený o 10 minút"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index fde8f37..4701c80 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -77,12 +77,24 @@
     <item msgid="9115697840826129603">"Alarm je nastavljen na <xliff:g id="HOURS">%2$s</xliff:g> in <xliff:g id="MINUTES">%3$s</xliff:g> od zdaj."</item>
     <item msgid="2332583385137381060">"Alarm je nastavljen na <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> in <xliff:g id="MINUTES">%3$s</xliff:g> od zdaj."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 dan"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> dni"</string>
-    <string name="hour" msgid="2546819039651509323">"1 ura"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> ur"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minuta"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minut"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> dan</item>
+      <item quantity="two"><xliff:g id="NUMBER">%s</xliff:g> dneva</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> dni</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dni</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ura</item>
+      <item quantity="two"><xliff:g id="NUMBER">%s</xliff:g> uri</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> ure</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ur</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minuta</item>
+      <item quantity="two"><xliff:g id="NUMBER">%s</xliff:g> minuti</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minut</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Vsak dan"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Izberite uro"</string>
@@ -91,10 +103,10 @@
     <string name="settings" msgid="5849739030579520686">"Nastavitve"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Dolžina dremeža"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> minuta</item>
-      <item quantity="two"><xliff:g id="NUMBER">%d</xliff:g> minuti</item>
-      <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> minute</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minut</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minuta</item>
+      <item quantity="two"><xliff:g id="NUMBER">%s</xliff:g> minuti</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minut</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">minute</item>
@@ -103,7 +115,12 @@
       <item quantity="other">minute</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Utišanje po"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> min"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minuta</item>
+      <item quantity="two"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minuti</item>
+      <item quantity="few"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minut</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Nikoli"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minuta"</item>
@@ -180,6 +197,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Moj čas je <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Časi kroga:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. krog"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"Število: <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"Število: <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ura</item>
       <item quantity="two"><xliff:g id="NUMBER">%d</xliff:g> uri</item>
@@ -345,7 +366,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Razširi budilko"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Strni budilko"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"razveljavi"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarm je izbrisan."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarm je izbrisan"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/<xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Naslednji alarm: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -367,4 +388,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k.mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Neveljavna ura <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Ni alarmov ob <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Ni nastavljenih alarmov"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Štoparica že teče"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Štoparica ne teče"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Način štoparice je spremenjen"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Za to uro ni nastavljenega nobenega alarma"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Alarm ob <xliff:g id="ALARM_TIME">%s</xliff:g> je opuščen"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Ni nastavljenega časovnika"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Časovnik je izbrisan"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Časovnik že teče"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Zahteve ni mogoče dokončati, na voljo je več časovnikov"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Časovnik se je začel"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Časovnik je ponastavljen"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Časovnika ni mogoče ponastaviti, ker še teče. Če ga želite ponastaviti, ga ustavite."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Časovnik je že ustavljen"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Ni izbranega kraja"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Določeni kraj ni na voljo"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Ta kraj je že dodan"</string>
+    <string name="city_added" msgid="1335509457349179514">"Kraj <xliff:g id="CITY_NAME">%s</xliff:g> je dodan"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Kraj <xliff:g id="CITY_NAME">%s</xliff:g> je izbrisan"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Alarma ob <xliff:g id="ALARM_TIME">%s</xliff:g> še ni mogoče opustiti, ker je še vedno oddaljen več kot 24 ur"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Opusti alarm"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Izberite, kateri alarm želite opustiti"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Ni sproženih alarmov"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Alarm ob <xliff:g id="ALARM_TIME">%s</xliff:g> je preložen za 10 minut"</string>
 </resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 5b33d9c..b34936b 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Alarmi është vënë për <xliff:g id="HOURS">%2$s</xliff:g> e <xliff:g id="MINUTES">%3$s</xliff:g> nga momenti i tanishëm."</item>
     <item msgid="2332583385137381060">"Alarmi është vënë për <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g>, e <xliff:g id="MINUTES">%3$s</xliff:g> nga momenti i tanishëm."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 ditë"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> ditë"</string>
-    <string name="hour" msgid="2546819039651509323">"1 orë"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> orë"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minutë"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minuta"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ditë</item>
+      <item quantity="one">1 ditë</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> orë</item>
+      <item quantity="one">1 orë</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuta</item>
+      <item quantity="one">1 minutë</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Çdo ditë"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Zgjidh një orë"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Cilësimet"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Kohëzgjatja e dremitjes"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minuta</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuta</item>
       <item quantity="one">1 minutë</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minutë</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Hesht pas"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minuta"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minuta</item>
+      <item quantity="one">1 minutë</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Asnjeherë"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minutë"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Koha ime është <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Kohët e xhiros:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Xhiroja <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> orë</item>
       <item quantity="one">1 orë</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Zgjero alarmin"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Shpalos alarmin"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"zhbëj"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarmi u fshi."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarmi u fshi"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Alarmi tjetër: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Ora e pavlefshme <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Nuk ka asnjë alarm në <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Nuk ka asnjë alarm të planifikuar"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Kronometri është tashmë në ekzekutim"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Kronometri nuk është në ekzekutim"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Modaliteti i kronometrit u ndryshua"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Nuk ka asnjë alarm të planifikuar për këtë orë"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Alarmi në <xliff:g id="ALARM_TIME">%s</xliff:g> u hoq"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Nuk ka asnjë kohëmatës të caktuar"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Kohëmatësi u fshi"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Kohëmatësi është tashmë në ekzekutim"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Kërkesa nuk mund të realizohet, pasi ka shumë kohëmatës të disponueshëm"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Kohëmatësi filloi"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Kohëmatësi u rivendos"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Kohëmatësi nuk mund të rivendoset sepse është akoma në ekzekutim. Ndaloje për ta rivendosur."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Kohëmatësi është ndaluar tashmë"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Nuk u zgjodh asnjë qytet"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Qyteti që specifikove nuk ekziston të bazën e të dhënave"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Ai qytet është shtuar tashmë"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> u shtua"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> u fshi"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Alarmi në <xliff:g id="ALARM_TIME">%s</xliff:g> nuk mund të hiqet ende, pasi është akoma më shumë se 24 orë larg"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Hiqe alarmin"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Zgjidh se cilin alarm do të heqësh"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Nuk ka asnjë alarm të aktivizuar"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Alarmi në <xliff:g id="ALARM_TIME">%s</xliff:g> u shty për 10 minuta"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 19084aa..8321b71 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -75,12 +75,21 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 дан"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> дана"</string>
-    <string name="hour" msgid="2546819039651509323">"1 сат"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> сата(и)"</string>
-    <string name="minute" msgid="2486157997434653710">"1 минут"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> минута"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> дан</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> дана</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> дана</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> сат</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> сата</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> сати</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> минут</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> минута</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минута</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Сваког дана"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Изаберите сат"</string>
@@ -89,9 +98,9 @@
     <string name="settings" msgid="5849739030579520686">"Подешавања"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Дужина одлагања"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> минут</item>
-      <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> минута</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> минута</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> минут</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> минута</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минута</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">минут</item>
@@ -99,7 +108,11 @@
       <item quantity="other">минута</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Утишај након"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> минута"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> минут</item>
+      <item quantity="few"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> минута</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> минута</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Никада"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 минут"</item>
@@ -176,6 +189,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"Бр. <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"Бр. <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> сат</item>
       <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> сата</item>
@@ -338,7 +355,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Прошири аларм"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Скупи аларм"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"опозови"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Аларм је избрисан."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Аларм је избрисан"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/<xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Следећи аларм: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -359,4 +376,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Нема заказаних аларма"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Штоперица је већ покренута"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Штоперица није покренута"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Режим штоперице је промењен"</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Аларм за <xliff:g id="ALARM_TIME">%s</xliff:g> је одбачен"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Ниједан тајмер није подешен"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Тајмер је избрисан"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Тајмер је већ покренут"</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"Тајмер је покренут"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Тајмер је ресетован"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Тајмер не може да се ресетује јер је још увек покренут. Зауставите тајмер да бисте га ресетовали."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Тајмер је већ заустављен"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Ниједан град није изабран"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Град који сте навели није доступан"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Овај град је већ додат"</string>
+    <string name="city_added" msgid="1335509457349179514">"Додали сте: <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Избрисали сте: <xliff:g id="CITY_NAME">%s</xliff:g>"</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>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <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>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 66a10c9..45f4221 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Alarmet ringer om <xliff:g id="HOURS">%2$s</xliff:g> och <xliff:g id="MINUTES">%3$s</xliff:g> från och med nu."</item>
     <item msgid="2332583385137381060">"Alarmet ringer om <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> och <xliff:g id="MINUTES">%3$s</xliff:g> från och med nu."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 dag"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> dagar"</string>
-    <string name="hour" msgid="2546819039651509323">"1 timme"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> timmar"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minut"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minuter"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dagar</item>
+      <item quantity="one">1 dag</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> timmar</item>
+      <item quantity="one">1 timme</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuter</item>
+      <item quantity="one">1 minut</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Varje dag"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Välj en klocka"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Inställningar"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Snooze-intervall"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minuter</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuter</item>
       <item quantity="one">1 minut</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">minut</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Alarmet upphör efter"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minuter"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minuter</item>
+      <item quantity="one">1 minut</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Aldrig"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minut"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Min tid är <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Varvtider:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Varv <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"Antal: <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"Antal: <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> timmar</item>
       <item quantity="one">1 timme</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Expandera alarm"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Komprimera alarm"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"ångra"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarmet har tagits bort."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarmet har tagits bort"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Nästa alarm: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Ogiltig tid: <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Inget alarm den här tiden: <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Inga inställda alarm"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Tidtagaruret har redan startats"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Tidtagaruret har inte startats"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Läget för tidtagaruret har ändrats"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Det finns inga alarm den här tiden"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Alarmet som var inställt på <xliff:g id="ALARM_TIME">%s</xliff:g> har ignorerats"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Ingen timer har ställts in"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Timern har raderats"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Timern har redan startats"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Det gick inte att slutföra begäran – flera timer är tillgängliga"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Timern har startats"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Timern har återställts"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Det går inte att återställa timern eftersom den är aktiv. Stoppa timern om du vill återställa den."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Timern har redan stoppats"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Ingen stad har valts"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Staden du angav är inte tillgänglig"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Den här staden har redan lagts till"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> har lagts till"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> har raderats"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Det går inte att ignorera alarmet som är inställt på <xliff:g id="ALARM_TIME">%s</xliff:g> ännu. Det dröjer mer än 24 timmar innan det aktiveras"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Stäng av alarm"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Välj de alarm som ska ignoreras"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Inga alarm aktiveras"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Alarmet som är inställt på <xliff:g id="ALARM_TIME">%s</xliff:g> har skjutits upp i tio minuter"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index a34f03c..ea1c615 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Kengele imewekwa na italia baada ya <xliff:g id="HOURS">%2$s</xliff:g> na <xliff:g id="MINUTES">%3$s</xliff:g> kutoka sasa."</item>
     <item msgid="2332583385137381060">"Kengele imewekwa na italia baada ya <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> na <xliff:g id="MINUTES">%3$s</xliff:g> kutoka sasa."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"siku 1"</string>
-    <string name="days" msgid="2070509222727852210">"siku <xliff:g id="DAYS">%s</xliff:g>"</string>
-    <string name="hour" msgid="2546819039651509323">"Saa 1"</string>
-    <string name="hours" msgid="2071487018566991613">"Saa<xliff:g id="HOURS">%s</xliff:g>"</string>
-    <string name="minute" msgid="2486157997434653710">"Dakika 1"</string>
-    <string name="minutes" msgid="6115838729146292526">"Dakika <xliff:g id="MINUTES">%s</xliff:g>"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other">Siku <xliff:g id="NUMBER">%s</xliff:g></item>
+      <item quantity="one">Siku 1</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other">Saa <xliff:g id="NUMBER">%s</xliff:g></item>
+      <item quantity="one">Saa 1</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other">Dakika <xliff:g id="NUMBER">%s</xliff:g></item>
+      <item quantity="one">Dakika 1</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Kila siku"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Chagua saa"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Mipangilio"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Nikumbushe baada ya"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other">Dakika <xliff:g id="NUMBER">%d</xliff:g> </item>
+      <item quantity="other">Dakika <xliff:g id="NUMBER">%s</xliff:g> </item>
       <item quantity="one">Dakika 1</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">dakika</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Kimya baada ya"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> dakika"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other">Dakika <xliff:g id="FORMATTED_NUMBER">%s</xliff:g> </item>
+      <item quantity="one">Dakika 1</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Katu"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"Dakika 1"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Muda wangu ni <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Muda wa mzunguko:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Mzunguko <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other">Saa <xliff:g id="NUMBER">%d</xliff:g></item>
       <item quantity="one">Saa 1</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Panua kengele"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Kunja kengele"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"tendua"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Kengele imefutwa."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Kengele imefutwa"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Kengele inayofuata: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Wakati usio sahihi <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Hakuna kengele ya saa <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Hakuna kengele zilizopangwa"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Saa ya kupima muda tayari inatumika"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Saa ya kupima muda haitumiki"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Hali ya saa ya kupima muda imebadilishwa"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Hakuna kengele iliyopangwa kwa wakati huu"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Kengele ya <xliff:g id="ALARM_TIME">%s</xliff:g> imeondolewa"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Hakuna kipima muda"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Kipima muda kimefutwa"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Kipima muda kinatumika tayari"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Tumeshindwa kukamilisha ombi lako, kuna vipimaji vingi vya wakati"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Kipima muda kimeanzishwa"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Kipima muda kimewekwa upya"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Kipima muda hakiwezi kuwekwa upya kwa sababu bado kinatumika. Simamisha kipima muda ili kukiweka upya."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Kipima muda kimesimamishwa tayari"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Hujachagua jiji"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Jiji ulilobainisha halipo"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Jiji hilo limeongezwa tayari"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> imeongezwa"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> imefutwa"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Kengele ya saa <xliff:g id="ALARM_TIME">%s</xliff:g> bado haiwezi kuondolewa, ina zaidi ya saa 24 kabla muda wake ufike"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Ondoa kengele"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Chagua kengele utakayoondoa"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Hakuna kengele zinazolia"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Kengele ya <xliff:g id="ALARM_TIME">%s</xliff:g> imeahirishwa kwa dakika 10"</string>
 </resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 255ad12..cf52cba 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -35,7 +35,6 @@
     <dimen name="bottom_text_spacing_digital">-18dp</dimen>
     <dimen name="bottom_text_spacing_analog">18dp</dimen>
     <dimen name="bottom_text_spacing_analog_small">10dp</dimen>
-    <dimen name="digital_screensaver_clock_text_size">104sp</dimen>
 
     <dimen name="alarm_side_padding">48dip</dimen>
     <dimen name="clock_side_padding">48dip</dimen>
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
index d1eef05..525d655 100644
--- a/res/values-sw720dp-land/dimens.xml
+++ b/res/values-sw720dp-land/dimens.xml
@@ -27,7 +27,6 @@
     <dimen name="timer_setup_button_size">36sp</dimen>
     <dimen name="timer_setup_delete_start_margin">38sp</dimen>
     <dimen name="timer_setup_label_size">24sp</dimen>
-    <dimen name="digital_screensaver_clock_text_size">120sp</dimen>
 
     <dimen name="alarm_side_padding">192dip</dimen>
     <dimen name="clock_side_padding">96dip</dimen>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index e245b12..22c56d1 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 நாள்"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> நாட்கள்"</string>
-    <string name="hour" msgid="2546819039651509323">"1 மணிநேரம்"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> மணிநேரம்"</string>
-    <string name="minute" msgid="2486157997434653710">"1 நிமிடம்"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> நிமிடங்கள்"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> நாட்கள்</item>
+      <item quantity="one">1 நாள்</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> மணிநேரம்</item>
+      <item quantity="one">1 மணிநேரம்</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> நிமிடங்கள்</item>
+      <item quantity="one">1 நிமிடம்</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"ஒவ்வொரு நாளும்"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"கடிகாரத்தைத் தேர்வுசெய்யவும்"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"அமைப்பு"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"உறக்கநிலையில் இருக்கும் காலஅளவு"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> நிமிடங்கள்</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> நிமிடங்கள்</item>
       <item quantity="one">1 நிமிடம்</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">நிமிடம்</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"அமைதியாக்க வெண்டியது"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> நிமிடங்கள்"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> நிமிடங்கள்</item>
+      <item quantity="one">1 நிமிடம்</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"எப்போதும் வேண்டாம்"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 நிமிடம்"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> மணிநேரம்</item>
       <item quantity="one">1 மணிநேரம்</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"அலாரத்தை விரிவாக்கு"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"அலாரத்தைச் சுருக்கு"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"செயல்தவிர்"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"அலாரம் நீக்கப்பட்டது."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"அலாரம் நீக்கப்பட்டது"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"அடுத்த அலாரம்: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"தவறான நேரம் <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>க்கு அலாரம் எதுவுமில்லை"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"அலாரங்கள் எதுவும் அமைக்கப்படவில்லை"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"ஸ்டாப்வாட்ச் இயங்கிக்கொண்டிருக்கிறது"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"ஸ்டாப்வாட்ச் இயங்கவில்லை"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"ஸ்டாப்வாட்சின் முறை மாற்றப்பட்டது"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"டைமர் எதுவும் அமைக்கப்படவில்லை"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"டைமர் நீக்கப்பட்டது"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"டைமர் இயங்கிக்கொண்டிருக்கிறது"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"பல டைமர்கள் உள்ளதால், கோரிக்கையை நிறைவேற்ற முடியவில்லை"</string>
+    <string name="timer_started" msgid="6715582052946641641">"டைமர் தொடங்கியது"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"டைமர் மீட்டமைக்கப்பட்டது"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"டைமர் இயங்குவதால் மீட்டமைக்க முடியாது. மீட்டமைக்க, டைமரை நிறுத்தவும்."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"டைமர் ஏற்கனவே நிறுத்தப்பட்டது"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"நகரம் எதுவும் தேர்ந்தெடுக்கப்படவில்லை"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"குறிப்பிட்ட நகரம் இல்லை"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"நகரம் ஏற்கனவே சேர்க்கப்பட்டுள்ளது"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> சேர்க்கப்பட்டது"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> நீக்கப்பட்டது"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"இன்னும் 24 மணிநேரத்திற்கு அதிகமாக இருப்பதால், <xliff:g id="ALARM_TIME">%s</xliff:g> அலாரத்தை விலக்க முடியாது"</string>
+    <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>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index fbeb1dd..7bbe8f3 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 రోజు"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> రోజులు"</string>
-    <string name="hour" msgid="2546819039651509323">"1 గంట"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> గంటలు"</string>
-    <string name="minute" msgid="2486157997434653710">"1 నిమిషం"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> నిమిషాలు"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> రోజులు</item>
+      <item quantity="one">1 రోజు</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> గంటలు</item>
+      <item quantity="one">1 గంట</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> నిమిషాలు</item>
+      <item quantity="one">1 నిమిషం</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"ప్రతి రోజు"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"గడియారాన్ని ఎంచుకోండి"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"సెట్టింగ్‌లు"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"తాత్కాలిక ఆపివేత నిడివి"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> నిమిషాలు</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> నిమిషాలు</item>
       <item quantity="one">1 నిమిషం</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">నిమిషం</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"ఇంత సమయం తర్వాత నిశ్శబ్దంగా ఉండాలి"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> నిమిషాలు"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> నిమిషాలు</item>
+      <item quantity="one">1 నిమిషం</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"ఎప్పటికీ వద్దు"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 నిమిషం"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> గంటలు</item>
       <item quantity="one">1 గంట</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"అలారంను విస్తరింపజేయండి"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"అలారం వివరాలు కుదించు"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"చర్య రద్దు చేయి"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"అలారం తొలగించబడింది."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"అలారం తొలగించబడింది"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"తదుపరి అలారం: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"<xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g> సమయం చెల్లదు"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>కి అలారం ఏదీ లేదు"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"షెడ్యూల్ చేసిన అలారాలు ఏవీ లేవు"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"స్టాప్‌వాచ్ ఇప్పటికే అమలవుతోంది"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"స్టాప్‌వాచ్ అమలు కావడం లేదు"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"స్టాప్‌వాచ్ మోడ్‌ను మార్చారు"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"టైమర్ ఏదీ సెట్ చేయలేదు"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"టైమర్‌ను తొలగించారు"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"టైమర్ ఇప్పటికే అమలవుతోంది"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"మీ అభ్యర్థనను పూర్తి చేయడం సాధ్యపడలేదు, పలు టైమర్‌లు అందుబాటులో ఉన్నాయి"</string>
+    <string name="timer_started" msgid="6715582052946641641">"టైమర్‌ను ప్రారంభించారు"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"టైమర్‌ను రీసెట్ చేసారు"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"టైమర్ ఇప్పటికీ అమలవుతూనే ఉన్నందున దాన్ని రీసెట్ చేయలేరు. రీసెట్ చేయడానికి టైమర్‌ను ఆపివేయండి."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"టైమర్ ఇప్పటికే ఆపివేయబడింది"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"నగరం ఏదీ ఎంచుకోలేదు"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"మీరు పేర్కొన్న నగరం అందుబాటులో లేదు"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"ఆ నగరాన్ని ఇప్పటికే జోడించారు"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g>ని జోడించారు"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g>ని తొలగించారు"</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>
+    <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>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 75c733d..a0fd579 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 วัน"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> วัน"</string>
-    <string name="hour" msgid="2546819039651509323">"1 ชั่วโมง"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> ชั่วโมง"</string>
-    <string name="minute" msgid="2486157997434653710">"1 นาที"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> นาที"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> วัน</item>
+      <item quantity="one">1 วัน</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ชั่วโมง</item>
+      <item quantity="one">1 ชั่วโมง</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> นาที</item>
+      <item quantity="one">1 นาที</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"ทุกวัน"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"เลือกนาฬิกา"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"การตั้งค่า"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"ระยะเวลาปิดเสียงเตือนชั่วคราว"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> นาที</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> นาที</item>
       <item quantity="one">1 นาที</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">นาที</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"ปิดเสียงหลังจาก"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> นาที"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> นาที</item>
+      <item quantity="one">1 นาที</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"ไม่ใช้"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 นาที"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ชั่วโมง</item>
       <item quantity="one">1 ชั่วโมง</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"ขยายการแจ้งเตือน"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"ยุบการแจ้งเตือน"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"เลิกทำ"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"ลบการแจ้งเตือนแล้ว"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"ลบการแจ้งเตือนแล้ว"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"ปลุกครั้งถัดไป: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"เวลาไม่ถูกต้อง <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"ไม่มีการปลุกที่เวลา <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"ไม่มีการตั้งปลุก"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"นาฬิกาจับเวลากำลังทำงานอยู่แล้ว"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"นาฬิกาจับเวลาไม่ได้ทำงานอยู่"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"เปลี่ยนแปลงโหมดนาฬิกาจับเวลาแล้ว"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"ไม่มีการตั้งจับเวลา"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"ลบตัวจับเวลาแล้ว"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"ตัวจับเวลากำลังทำงานอยู่แล้ว"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"ไม่สามารถดำเนินการตามคำขอได้สำเร็จ เพราะมีการจับเวลาหลายรายการ"</string>
+    <string name="timer_started" msgid="6715582052946641641">"เริ่มจับเวลาแล้ว"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"รีเซ็ตตัวจับเวลาแล้ว"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"ไม่สามารถรีเซ็ตตัวจับเวลาได้เนื่องจากยังทำงานอยู่ โปรดหยุดตัวจับเวลาเพื่อรีเซ็ต"</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"หยุดตัวจับเวลาไปแล้ว"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"ไม่ได้เลือกเมือง"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"ไม่มีเมืองที่คุณระบุ"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"เพิ่มเมืองนั้นไว้แล้ว"</string>
+    <string name="city_added" msgid="1335509457349179514">"เพิ่ม <xliff:g id="CITY_NAME">%s</xliff:g> แล้ว"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"ลบ <xliff:g id="CITY_NAME">%s</xliff:g> แล้ว"</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>
+    <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>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 8e9f497..57c5258 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Nakatakda ang alarm sa <xliff:g id="HOURS">%2$s</xliff:g> at <xliff:g id="MINUTES">%3$s</xliff:g> mula ngayon."</item>
     <item msgid="2332583385137381060">"Nakatakda ang alarm sa <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g>, at <xliff:g id="MINUTES">%3$s</xliff:g> mula ngayon."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 araw"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> (na) araw"</string>
-    <string name="hour" msgid="2546819039651509323">"1 oras"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> (na) oras"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minuto"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> (na) minuto"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> araw</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> na araw</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> oras</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> na oras</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minuto</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> na minuto</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Araw-araw"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Pumili ng orasan"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"Mga Setting"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Tagal ng pag-snooze"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> minuto</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> na minuto</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minuto</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> na minuto</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">minuto</item>
       <item quantity="other">na minuto</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Tahimik pagkatapos ng"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> (na) minuto"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minuto</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> na minuto</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Hindi Kailanman"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 minuto"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Ang aking oras ay <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Mga lap time:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Lap <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> oras</item>
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> na oras</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Alarm sa pagpalawak"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Alarma sa pagtiklop"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"i-undo"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Na-delete ang alarm."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Natanggal ang alarm"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Susunod na alarma: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Hindi wastong oras na <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Walang alarm sa <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Walang mga naka-iskedyul na alarm"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Gumagana na ang stopwatch"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Hindi gumagana ang stopwatch"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Nabago na ang stopwatch mode"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Walang nakaiskedyul na alarm para sa oras na ito"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Na-dismiss ang alarm na <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Walang nakatakdang timer"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Na-delete ang timer"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Gumagana na ang timer"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Hindi makumpleto ang iyong kahilingan, available ang maraming timer"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Sinimulan ang timer"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Ni-reset ang timer"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Hindi maaaring i-reset ang timer dahil gumagana pa ito. Ihinto ang timer upang i-reset."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Huminto na ang timer"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Walang napiling lungsod"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Hindi available ang lungsod na tinukoy mo"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Naidagdag na ang lungsod na iyan"</string>
+    <string name="city_added" msgid="1335509457349179514">"Idinagdag ang <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Na-delete ang <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Hindi pa maaaring i-dismiss ang alarm na <xliff:g id="ALARM_TIME">%s</xliff:g>, mahigit 24 na oras pa bago ito dumating"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"I-dismiss ang alarm"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Piliin kung aling alarm ang idi-dismiss"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Walang mga gumaganang alarm"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Na-snooze sa loob ng 10 minuto ang alarm na <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 75690da..4427a70 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Alarmın çalmasına şu andan itibaren <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g> var."</item>
     <item msgid="2332583385137381060">"Alarmın çalmasına şu andan itibaren <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g> var."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 gün"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> gün"</string>
-    <string name="hour" msgid="2546819039651509323">"1 saat"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> saat"</string>
-    <string name="minute" msgid="2486157997434653710">"1 dakika"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> dakika"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> gün</item>
+      <item quantity="one">1 gün</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> saat</item>
+      <item quantity="one">1 saat</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dakika</item>
+      <item quantity="one">1 dakika</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Her gün"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Bir saat seçin"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Ayarlar"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Erteleme süresi"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> dakika</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dakika</item>
       <item quantity="one">1 dakika</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">dakika</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Şu süreden sonra sessiz:"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> dakika"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> dakika</item>
+      <item quantity="one">1 dakika</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Hiçbir zaman"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 dakika"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Saatim: <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Tur süreleri:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. tur"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"<xliff:g id="NUMBER">%d</xliff:g>."</item>
+    <item msgid="316923361931627987">"<xliff:g id="NUMBER">%02d</xliff:g>."</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> saat</item>
       <item quantity="one">1 saat</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Alarmı genişlet"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Alarmı daralt"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"geri al"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarm silindi."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Alarm silindi"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Sonraki alarm: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Programlanmış alarm yok"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Kronomotre zaten çalışıyor"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Kronometre çalışmıyor"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Kronometre modu değişti"</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"<xliff:g id="ALARM_TIME">%s</xliff:g> alarmı kapatıldı"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Zamanlayıcı ayarlanmadı"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Zamanlayıcı silindi"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Zamanlayıcı zaten çalışıyor"</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"Zamanlayıcı başlatıldı"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Zamanlayıcı sıfırlandı"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Zamanlayıcı hâlâ çalıştığından sıfırlanamaz. Sıfırlamak için zamanlayıcıyı durdurun."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Zamanlayıcı zaten durdu"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Şehir seçilmedi"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Belirttiğiniz şehir kullanılamıyor"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Bu şehir zaten eklendi"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> eklendi"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> silindi"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"<xliff:g id="ALARM_TIME">%s</xliff:g> alarmı henüz kapatılamaz. Alarma hâlâ 24 saatten fazla zaman var"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Alarmı kapat"</string>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Çalan alarm yok"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"<xliff:g id="ALARM_TIME">%s</xliff:g> alarmı 10 dakika ertelendi"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 08b2387..604018a 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -77,12 +77,24 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 дн."</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> дн."</string>
-    <string name="hour" msgid="2546819039651509323">"1 год."</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> год."</string>
-    <string name="minute" msgid="2486157997434653710">"1 хв."</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> хв."</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> день</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> дні</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> днів</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> дня</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> година</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> години</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> годин</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> години</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> хвилина</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> хвилини</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> хвилин</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> хвилини</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Щодня"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Виберіть годинник"</string>
@@ -91,10 +103,10 @@
     <string name="settings" msgid="5849739030579520686">"Налаштування"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Відкласти на"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> хвилина</item>
-      <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> хвилини</item>
-      <item quantity="many"><xliff:g id="NUMBER">%d</xliff:g> хвилин</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> хвилини</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> хвилина</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> хвилини</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> хвилин</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> хвилини</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">хвилина</item>
@@ -103,7 +115,12 @@
       <item quantity="other">хвилини</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Вимкнути будильник за…"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> хв."</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> хвилина</item>
+      <item quantity="few"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> хвилини</item>
+      <item quantity="many"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> хвилин</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> хвилини</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Ніколи"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 хвилину"</item>
@@ -180,6 +197,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"№ <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"№ <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> година</item>
       <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> години</item>
@@ -345,7 +366,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Посилити сигнал"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Згорнути"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"відмінити"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Будильник видалено"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Сигнал видалено"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Наступний сигнал: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -367,4 +388,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm дп"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Недійсний час: <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Немає будильника на <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Немає майбутніх будильників"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Секундомір уже запущено"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Секундомір не запущено"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Режим секундоміра змінено"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Таймер не встановлено"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Таймер видалено"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Таймер уже запущено"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Не вдається виконати запит, оскільки налаштовано декілька таймерів"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Таймер запущено"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Таймер скинуто"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Зупиніть таймер, щоб скинути його."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Таймер уже зупинено"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Виберіть місто"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Указане місто недоступне"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Це місто вже додано"</string>
+    <string name="city_added" msgid="1335509457349179514">"Місто <xliff:g id="CITY_NAME">%s</xliff:g> додано"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Місто <xliff:g id="CITY_NAME">%s</xliff:g> видалено"</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>
+    <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>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index ca36bd9..baf0f1c 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 دن"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> دن"</string>
-    <string name="hour" msgid="2546819039651509323">"1 گھنٹہ"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> گھنٹے"</string>
-    <string name="minute" msgid="2486157997434653710">"1 منٹ"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> منٹ"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> دن</item>
+      <item quantity="one">1 دن</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> گھنٹے</item>
+      <item quantity="one">1 گھنٹہ</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> منٹ</item>
+      <item quantity="one">1 منٹ</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"روزانہ"</string>
     <string name="day_concat" msgid="971998564991636532">"، "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"ایک کلاک منتخب کریں"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"ترتیبات"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"اسنوز کی طوالت"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> منٹ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> منٹ</item>
       <item quantity="one">1 منٹ</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">منٹ</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"خاموش بعد از"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> منٹ"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> منٹ</item>
+      <item quantity="one">1 منٹ</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"کبھی نہیں"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 منٹ"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> گھنٹے</item>
       <item quantity="one">1 گھنٹہ</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"الارم کی توسیع کریں"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"الارم کو سکیڑیں"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"کالعدم کریں"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"الارم حذف ہوگیا۔"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"الارم حذف ہوگیا"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"اگلا الارم: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"کوئی الارم مقرر نہیں"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"اسٹاپ واچ پہلے سے چل رہی ہے"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"اسٹاپ واچ نہیں چل رہی ہے"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"اسٹاپ واچ کی وضع تبدیل ہو گئی"</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"<xliff:g id="ALARM_TIME">%s</xliff:g> الارم برخاست ہوگیا"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"کوئی ٹائمر سیٹ نہیں"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"ٹائمر حذف ہوگیا"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"ٹائمر پہلے سے چل رہا ہے"</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"ٹائمر شروع ہوگیا"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"ٹائمر دوبارہ ترتیب دے دیا گیا"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"ٹائمر کو دوبارہ ترتیب نہیں دیا جا سکتا کیوںکہ یہ ابھی چل رہا ہے۔ دوبارہ ترتیب دینے کیلیے ٹائمر کو روک دیں۔"</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"ٹائمر پہلے ہی روک دیا گیا"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"کوئی شہر منتخب نہیں"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"آپ کا بیان کردہ شہر دستیاب نہیں ہے"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"اس شہر کو پہلے ہی شامل کر دیا گیا ہے"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> شامل ہوگیا"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> حذف ہوگیا"</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>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <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>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index d07671c..70264c1 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Uyg‘otkich <xliff:g id="HOURS">%2$s</xliff:g>u <xliff:g id="MINUTES">%3$s</xliff:g>dan so‘ng chalinadi."</item>
     <item msgid="2332583385137381060">"Uyg‘otkich signali <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>dan so‘ng chalinadi."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 kun"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> kun"</string>
-    <string name="hour" msgid="2546819039651509323">"1 soat"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> soat"</string>
-    <string name="minute" msgid="2486157997434653710">"1 daqiqa"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> daqiqa"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> kun</item>
+      <item quantity="one">1 kun</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> soat</item>
+      <item quantity="one">1 soat</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> daqiqa</item>
+      <item quantity="one">1 daqiqa</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Har kuni"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Soatni tanlang"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Sozlamalar"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Takrorlanish oralig‘i"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> daqiqa</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> daqiqa</item>
       <item quantity="one">1 daqiqa</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">daqiqa</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Avtomatik o‘chirish"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> daqiqa"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> daqiqa</item>
+      <item quantity="one">1 daqiqa</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Hech qachon"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 daqiqa"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Mening vaqtim: <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Aylanish vaqti:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>-davra"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"#<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"#<xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> soat</item>
       <item quantity="one">1 soat</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Uyg‘otkichni ochish"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Yopish"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"bekor"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Uyg‘otkich o‘chirildi"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Signal o‘chirib tashlandi"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Keyingi uyg‘otkich: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Hech qanday rejalashtirilgan signal yo‘q"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Sekundomer allaqachon ishga tushgan"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Sekundomer ishlamayapti"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Sekundomer rejimi o‘zgardi"</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"<xliff:g id="ALARM_TIME">%s</xliff:g> dagi signal rad etildi"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Hech qanday taymer o‘rnatilmagan"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Taymer o‘chirib tashlandi"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Taymer allaqachon ishga tushgan"</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"Taymer ishga tushdi"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Taymer qayta o‘rnatildi"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Taymerni qayta o‘rnatib bo‘lmaydi, chunki u haliyam ishlayapti. Avval taymerni to‘xtating."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Taymer allaqachon to‘xtagan"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Hech qanday shahar tanlamadi"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Siz aytgan shahar mavjud emas"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Bu shahar allaqachon qo‘shilgan"</string>
+    <string name="city_added" msgid="1335509457349179514">"<xliff:g id="CITY_NAME">%s</xliff:g> qo‘shildi"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"<xliff:g id="CITY_NAME">%s</xliff:g> o‘chirib tashlandi"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"<xliff:g id="ALARM_TIME">%s</xliff:g> dagi signalni rad etib bo‘lmaydi, ungacha hali 24 soatdan ortiq vaqt bor"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Signalni o‘chirish"</string>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Hech qanday chalinayotgan signal yo‘q"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"<xliff:g id="ALARM_TIME">%s</xliff:g> dagi signal 10 daqiqa surildi"</string>
 </resources>
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index dc4f7ae..6bef8d1 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -20,6 +20,21 @@
         <item name="android:elevation">8dip</item>
     </style>
 
+    <style name="SettingsTheme" parent="BaseActivityTheme">
+        <item name="android:alertDialogTheme">@style/SettingsAlertDialogTheme</item>
+        <item name="android:detailsElementBackground">@null</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+
+        <!-- Attributes from support.v7.appcompat -->
+        <item name="actionBarStyle">@style/SettingsActionBarStyle</item>
+    </style>
+
+    <!-- Theme that will be used by PreferenceFragment (i.e. *not* AppCompat). -->
+    <style name="SettingsAlertDialogTheme" parent="android:Theme.Material.Dialog.Alert">
+        <item name="android:colorAccent">?attr/colorAccent</item>
+    </style>
+
     <!-- Custom notification content styles -->
     <style name="TextAppearance.StatusBar.EventContent">
         <item name="android:textSize">@dimen/notification_text_size</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9d504f8..71a4928 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"Báo thức được đặt cho <xliff:g id="HOURS">%2$s</xliff:g> và <xliff:g id="MINUTES">%3$s</xliff:g> tính từ bây giờ."</item>
     <item msgid="2332583385137381060">"Báo thức được đặt cho <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> và <xliff:g id="MINUTES">%3$s</xliff:g> tính từ bây giờ."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 ngày"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> ngày"</string>
-    <string name="hour" msgid="2546819039651509323">"1 giờ"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> giờ"</string>
-    <string name="minute" msgid="2486157997434653710">"1 phút"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> phút"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ngày</item>
+      <item quantity="one">1 ngày</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> giờ</item>
+      <item quantity="one">1 giờ</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> phút</item>
+      <item quantity="one">1 phút</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Hàng ngày"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Chọn đồng hồ"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"Cài đặt"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Thời lượng báo lại"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> phút</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> phút</item>
       <item quantity="one">1 phút</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">phút</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Im lặng sau"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> phút"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> phút</item>
+      <item quantity="one">1 phút</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Không bao giờ"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 phút"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Thời gian của tôi là <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Số vòng chạy:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Vòng chạy <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> giờ</item>
       <item quantity="one">1 giờ</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Mở rộng báo thức"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Thu gọn báo thức"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"hoàn tác"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Đã xóa báo thức."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"Đã xóa báo thức"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"Báo thức tiếp theo: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Thời gian <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g> không hợp lệ"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Chưa có báo thức lúc <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Chưa có báo thức nào được lên lịch"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Đồng hồ bấm giờ vẫn đang chạy"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Đồng hồ bấm giờ hiện không chạy"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Đã thay đổi chế độ đồng hồ bấm giờ"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Chưa có báo thức nào được lên lịch cho thời gian này"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Đã loại bỏ báo thức <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Chưa đặt bộ hẹn giờ"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Đã xóa bộ hẹn giờ"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Bộ hẹn giờ vẫn đang chạy"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Không thể hoàn tất yêu cầu của bạn, có nhiều mức hẹn giờ"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Đã khởi động bộ hẹn giờ"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Đã đặt lại bộ hẹn giờ"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Không thể đặt lại bộ hẹn giờ vì bộ hẹn giờ vẫn đang chạy. Dừng bộ hẹn giờ để đặt lại."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Bộ hẹn giờ đã dừng"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Chưa có thành phố nào được chọn"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Thành phố bạn chỉ định không có sẵn"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Thành phố này đã được thêm"</string>
+    <string name="city_added" msgid="1335509457349179514">"Đã thêm <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"Đã xóa <xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Chưa thể loại bỏ báo thức <xliff:g id="ALARM_TIME">%s</xliff:g> vì vẫn còn cách hơn 24 giờ nữa"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Hủy báo thức"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Chọn báo thức để loại bỏ"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Chưa có báo thức kích hoạt nào"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"Báo lại báo thức <xliff:g id="ALARM_TIME">%s</xliff:g> sau 10 phút"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c460007..149bd58 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1天"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g>天"</string>
-    <string name="hour" msgid="2546819039651509323">"1小时"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g>小时"</string>
-    <string name="minute" msgid="2486157997434653710">"1分钟"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g>分钟"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 天</item>
+      <item quantity="one">1 天</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 小时</item>
+      <item quantity="one">1 小时</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 分钟</item>
+      <item quantity="one">1 分钟</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"每天"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"选择时钟"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"设置"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"暂停时长"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> 分钟</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 分钟</item>
       <item quantity="one">1 分钟</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">分钟</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"闹铃时长"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g>分钟"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> 分钟</item>
+      <item quantity="one">1 分钟</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"不停歇"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 分钟"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> 小时</item>
       <item quantity="one">1 小时</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"展开闹钟"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"折叠闹钟"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"撤消"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"闹钟已删除。"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"闹钟已删除"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"下次闹钟时间:<xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEEa h:mm"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE k:mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"未设置任何闹钟"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"秒表已在计时"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"秒表目前未运行"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"秒表模式已更改"</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"已关闭 <xliff:g id="ALARM_TIME">%s</xliff:g> 的闹钟"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"未设置任何计时器"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"已删除计时器"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"计时器已在计时"</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"已启动计时器"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"已重置计时器"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"计时器仍在计时,无法重置。停止计时器即可重置。"</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"计时器之前已停止"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"未选择任何城市"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"数据库中没有您指定的城市"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"已添加过该城市"</string>
+    <string name="city_added" msgid="1335509457349179514">"已添加<xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"已删除<xliff:g id="CITY_NAME">%s</xliff:g>"</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>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <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>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 116cda8..0311d10 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 天"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> 天"</string>
-    <string name="hour" msgid="2546819039651509323">"1 小時"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> 小時"</string>
-    <string name="minute" msgid="2486157997434653710">"1 分鐘"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> 分鐘"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 天</item>
+      <item quantity="one">1 天</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 小時</item>
+      <item quantity="one">1 小時</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 分鐘</item>
+      <item quantity="one">1 分鐘</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"每天"</string>
     <string name="day_concat" msgid="971998564991636532">"、 "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"選擇時鐘"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"設定"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"重響時間長度"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> 分鐘</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 分鐘</item>
       <item quantity="one">1 分鐘</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">1 分鐘</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"以下時間過後停止鈴聲:"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> 分鐘"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> 分鐘</item>
+      <item quantity="one">1 分鐘</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"永不"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 分鐘"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> 小時</item>
       <item quantity="one">1 小時</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"展開鬧鐘"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"收合鬧鐘"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"復原"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"已刪除鬧鐘。"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"已刪除鬧鐘"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"下次鬧鐘時間:<xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE,a h:mm"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE,K:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"無效時間 <xliff:g id="INVALID_PMAM">%s</xliff:g> <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"沒有 <xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g> 的鬧鐘"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"沒有已預設的鬧鐘"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"碼錶執行中"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"碼錶並非執行中"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"已更改碼錶模式"</string>
+    <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>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"沒有設定倒數計時器"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"已刪除倒數計時器"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"倒數計時器執行中"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"無法完成您的要求,已設定多個倒數計時器"</string>
+    <string name="timer_started" msgid="6715582052946641641">"已開始倒數計時器"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"已重設倒數計時器"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"倒數計時器執行中,無法重設。停止倒數計時器即可重設。"</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"倒數計時器已停止"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"尚未選取城市"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"您所指定的城市並不存在"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"已新增該城市"</string>
+    <string name="city_added" msgid="1335509457349179514">"已新增<xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"已刪除<xliff:g id="CITY_NAME">%s</xliff:g>"</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>
+    <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>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 64c36f8..c64c18d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -73,12 +73,18 @@
     <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>
-    <string name="day" msgid="7984755014526510295">"1 天"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> 天"</string>
-    <string name="hour" msgid="2546819039651509323">"1 小時"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> 小時"</string>
-    <string name="minute" msgid="2486157997434653710">"1 分鐘"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> 分鐘"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 天</item>
+      <item quantity="one">1 天</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 小時</item>
+      <item quantity="one">1 小時</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 分鐘</item>
+      <item quantity="one">1 分鐘</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"每天"</string>
     <string name="day_concat" msgid="971998564991636532">"、 "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"選擇時鐘"</string>
@@ -87,7 +93,7 @@
     <string name="settings" msgid="5849739030579520686">"設定"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"延後時間長度"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> 分鐘</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 分鐘</item>
       <item quantity="one">1 分鐘</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
@@ -95,7 +101,10 @@
       <item quantity="one">分鐘</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"鬧鐘鈴響持續時間:"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> 分鐘"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> 分鐘</item>
+      <item quantity="one">1 分鐘</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"無限期"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 分鐘"</item>
@@ -172,6 +181,10 @@
     <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-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> 小時</item>
       <item quantity="one">1 小時</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"展開鬧鐘"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"收合鬧鐘"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"復原"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"已刪除鬧鐘。"</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"已刪除鬧鐘"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"下次鬧鐘時間:<xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,41 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE h:mm (a)"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE k:mm"</string>
+    <!-- no translation found for invalid_time (8369328732811670187) -->
+    <skip />
+    <!-- no translation found for no_alarm_at (8140632482969193119) -->
+    <skip />
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"未設定鬧鐘"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"碼錶已在執行中"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"碼錶目前未啟動"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"碼錶模式已變更"</string>
+    <!-- no translation found for no_alarm_scheduled_for_this_time (4463069177414482818) -->
+    <skip />
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"已關閉 <xliff:g id="ALARM_TIME">%s</xliff:g> 的鬧鐘"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"未設定計時器"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"已刪除計時器"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"計時器已在執行中"</string>
+    <!-- no translation found for multiple_timers_available (6722110840279707462) -->
+    <skip />
+    <string name="timer_started" msgid="6715582052946641641">"已啟動計時器"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"已重設計時器"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"計時器仍在執行中,因此無法重設。停止計時器後才可重設。"</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"計時器先前已停止"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"未選取任何城市"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"資料庫中沒有您指定的城市"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"先前已新增該城市"</string>
+    <string name="city_added" msgid="1335509457349179514">"已新增<xliff:g id="CITY_NAME">%s</xliff:g>"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"已刪除<xliff:g id="CITY_NAME">%s</xliff:g>"</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>
+    <!-- no translation found for pick_alarm_to_dismiss (5408769235866082896) -->
+    <skip />
+    <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>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 29ec2a0..5946405 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -73,12 +73,18 @@
     <item msgid="9115697840826129603">"I-alamu ihlelelwe u-<xliff:g id="HOURS">%2$s</xliff:g> kanye no-<xliff:g id="MINUTES">%3$s</xliff:g> ukusuka manje."</item>
     <item msgid="2332583385137381060">"I-alamu isethelwe <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g>, <xliff:g id="MINUTES">%3$s</xliff:g> kusuka manje."</item>
   </string-array>
-    <string name="day" msgid="7984755014526510295">"1 usuku"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> izinsuku"</string>
-    <string name="hour" msgid="2546819039651509323">"1 ihora"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> amahora"</string>
-    <string name="minute" msgid="2486157997434653710">"1 iminithi"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> amaminithi"</string>
+    <plurals name="days" formatted="false" msgid="3706846447285206235">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> izinsuku</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> izinsuku</item>
+    </plurals>
+    <plurals name="hours" formatted="false" msgid="3871283109767171655">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> amahora</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> amahora</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="5484431721696058697">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> amaminithi</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> amaminithi</item>
+    </plurals>
     <string name="every_day" msgid="4100909974923444602">"Nsuku zonke"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="2656876819515011590">"Khetha iwashi"</string>
@@ -87,15 +93,18 @@
     <string name="settings" msgid="5849739030579520686">"Izilungiselelo"</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Ubude bokusnuza"</string>
     <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> amaminithi</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> amaminithi</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> amaminithi</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> amaminithi</item>
     </plurals>
     <plurals name="snooze_picker_label" formatted="false" msgid="322739253661747732">
       <item quantity="one">amaminithi</item>
       <item quantity="other">amaminithi</item>
     </plurals>
     <string name="auto_silence_title" msgid="2012754009554434544">"Ukuthula ngemuva"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> amaminithi"</string>
+    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
+      <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> amaminithi</item>
+      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> amaminithi</item>
+    </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Ungalokothi"</string>
   <string-array name="auto_silence_entries">
     <item msgid="3024545954917711306">"1 iminithi"</item>
@@ -172,6 +181,10 @@
     <string name="sw_share_main" msgid="7703563468204234405">"Isikhathi sami ngu-<xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="sw_share_laps" msgid="614390674795945007">"Ukuhluka kwezikhathi:"</string>
     <string name="sw_notification_lap_number" msgid="3535420316052647126">"Xhapha <xliff:g id="NUMBER">%d</xliff:g>"</string>
+  <string-array name="sw_lap_number_set">
+    <item msgid="2816627565030953899">"# <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item msgid="316923361931627987">"# <xliff:g id="NUMBER">%02d</xliff:g>"</item>
+  </string-array>
     <plurals name="Nhours_description" formatted="false" msgid="4539186407746763655">
       <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> amahora</item>
       <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> amahora</item>
@@ -331,7 +344,7 @@
     <string name="expand_alarm" msgid="7392616528943305020">"Nwebissa i-alamu"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"Nciphisa i-alamu"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"hlehlisa"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"I-alamu itholakele."</string>
+    <string name="alarm_deleted" msgid="6131529309389084785">"I-alamu itholakele"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="next_alarm_description" msgid="2650244835760747046">"I-alamu elandelayo: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
@@ -351,4 +364,36 @@
     <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
     <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
     <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
+    <string name="invalid_time" msgid="8369328732811670187">"Isikhathi esingavumelekile <xliff:g id="INVALID_HOUR">%d</xliff:g>:<xliff:g id="INVALID_MINUTES">%d</xliff:g> <xliff:g id="INVALID_PMAM">%s</xliff:g>"</string>
+    <string name="no_alarm_at" msgid="8140632482969193119">"Ayikho i-alamu ngo-<xliff:g id="ALARM_TIME_HOUR">%d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%d</xliff:g>"</string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Awekho ama-alamu ashejuliwe"</string>
+    <string name="stopwatch_already_running" msgid="6598258908106423672">"Isitopuwashi sesivele siqalisiwe"</string>
+    <string name="stopwatch_isnt_running" msgid="7147219965448204727">"Isitopuwashi asiqaliswanga"</string>
+    <string name="stopwatch_mode_changed" msgid="2096052973378533405">"Imodi yesitopuwashi ishintshiwe"</string>
+    <string name="no_alarm_scheduled_for_this_time" msgid="4463069177414482818">"Ayikho i-alamu eshejulelwe lesi sikhathi"</string>
+    <string name="alarm_is_dismissed" msgid="5509897230565826642">"<xliff:g id="ALARM_TIME">%s</xliff:g> i-alamu icashisiwe"</string>
+    <!-- no translation found for alarm_is_set (5503226382620011088) -->
+    <skip />
+    <string name="no_timer_set" msgid="3326365650863016606">"Asikho isibali sikhathi esisethiwe"</string>
+    <string name="timer_deleted" msgid="9110322362460029392">"Isibali sikhathi sisusiwe"</string>
+    <string name="timer_already_running" msgid="1259351124772803097">"Isibali sikhathi sesivele siqalisiwe"</string>
+    <string name="multiple_timers_available" msgid="6722110840279707462">"Ayikwazi ukuqedela isicelo sakho, izikhathi eziningi ziyatholakala"</string>
+    <string name="timer_started" msgid="6715582052946641641">"Isibali sikhathi siqalisiwe"</string>
+    <!-- no translation found for timer_created (4381027137335885547) -->
+    <skip />
+    <!-- no translation found for invalid_timer_length (3104567893212932487) -->
+    <skip />
+    <string name="timer_was_reset" msgid="6495796785185062631">"Isibali sikhathi sisethwe kabusha"</string>
+    <string name="timer_cant_be_reset_because_its_running" msgid="7880015473706806640">"Isibali sikhathi asikwazi ukusethwa kabusha ngoba sisaqalisiwe. Misa isibali sikhathi ukuze usethe kabusha."</string>
+    <string name="timer_already_stopped" msgid="8865820275829449054">"Isibali sikhathi sesivele simisiwe"</string>
+    <string name="no_city_selected" msgid="1007596865203283741">"Alikho idolobha elikhethiwe"</string>
+    <string name="the_city_you_specified_is_not_available" msgid="1753597460426454543">"Idolobha olicacisile alitholakali"</string>
+    <string name="the_city_already_added" msgid="3799050213771793020">"Lelo dolobha selivele lingeziwe"</string>
+    <string name="city_added" msgid="1335509457349179514">"I-<xliff:g id="CITY_NAME">%s</xliff:g> ingeziwe"</string>
+    <string name="city_deleted" msgid="3935141305276867838">"I-<xliff:g id="CITY_NAME">%s</xliff:g> isusiwe"</string>
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"<xliff:g id="ALARM_TIME">%s</xliff:g> i-alamu ayikwazi ukucashiswa okwamanje, kusasele amahora angu-24 akude"</string>
+    <string name="dismiss_alarm" msgid="7204593078688533541">"Cashisa i-alamu"</string>
+    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Khetha ukuthi iyiphi i-alamu engacashiswa"</string>
+    <string name="no_firing_alarms" msgid="4986161963178722289">"Awekho ama-alamu akhalayo"</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">"<xliff:g id="ALARM_TIME">%s</xliff:g> i-alamu isnuzwe ngamaminithi angu-10"</string>
 </resources>
diff --git a/res/values/array.xml b/res/values/array.xml
index d1b24d5..c13bd44 100644
--- a/res/values/array.xml
+++ b/res/values/array.xml
@@ -662,7 +662,7 @@
         <item>C38</item>
         <item>C39</item>
         <item>C40</item>
-        <item>C41</item>
+        <item>C0</item>
         <item>C42</item>
         <item>C43</item>
         <item>C44</item>
@@ -673,7 +673,7 @@
         <item>C49</item>
         <item>C50</item>
         <item>C51</item>
-        <item>C52</item>
+        <item>C0</item>
         <item>C53</item>
         <item>C54</item>
         <item>C55</item>
@@ -753,7 +753,7 @@
         <item>C0</item>
         <item>C130</item>
         <item>C131</item>
-        <item>C132</item>
+        <item>C0</item>
         <item>C133</item>
         <item>C134</item>
         <item>C135</item>
@@ -833,8 +833,8 @@
         <item>C209</item>
         <item>C210</item>
         <item>C211</item>
-        <item>C212</item>
-        <item>C213</item>
+        <item>C0</item>
+        <item>C0</item>
         <item>C214</item>
         <item>C215</item>
         <item>C216</item>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index e4ac0ea..c29c19f 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -19,7 +19,7 @@
 
 <!-- These resources are around just to allow their values to be customized
      for different hardware and product builds. -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources>
     <dimen name="label_text_size">14sp</dimen>
     <dimen name="time_text_size">120dip</dimen>
     <dimen name="ampm_text_size">20dip</dimen>
@@ -37,7 +37,6 @@
     <dimen name="top_text_spacing_digital">4dp</dimen>
     <dimen name="bottom_text_spacing_analog">14dp</dimen>
     <dimen name="bottom_text_spacing_analog_small">6dp</dimen>
-    <dimen name="digital_screensaver_clock_text_size">104sp</dimen>
 
     <dimen name="alarm_side_padding">12dip</dimen>
     <dimen name="clock_side_padding">12dip</dimen>
@@ -82,6 +81,10 @@
     <dimen name="alarm_info_font_size">36sp</dimen>
     <dimen name="no_alarm_font_size">16sp</dimen>
 
+    <dimen name="alarm_picker_dialog_horizontal_margin">30dp</dimen>
+    <dimen name="alarm_picker_dialog_vertical_margin">20dp</dimen>
+    <dimen name="alarm_picker_margin_bottom">10dp</dimen>
+
     <dimen name="body_font_padding">4dp</dimen>
     <dimen name="button_font_size">24sp</dimen>
     <dimen name="dialog_button_font_size">16sp</dimen>
diff --git a/res/values/donottranslate_events.xml b/res/values/donottranslate_events.xml
index 52f9d3b..40ba2d4 100644
--- a/res/values/donottranslate_events.xml
+++ b/res/values/donottranslate_events.xml
@@ -38,5 +38,4 @@
     <string name="label_deskclock">DeskClock</string>
     <string name="label_notification">Notification</string>
     <string name="label_intent">Intent</string>
-    <string name="label_voice">Voice</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 79ffcba..36844fe 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -176,23 +176,29 @@
         <item>Alarm set for <xliff:g id="DAYS" example="2 days">%1$s</xliff:g>, <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g>, and <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> from now.</item>
     </string-array>
 
-    <!-- Alarm confirmation toast: singular day -->
-    <string name="day">"1 day"</string>
+    <!-- Alarm confirmation toast: days -->
+    <plurals name="days">
+        <!-- Duration for one day -->
+        <item quantity="one">1 day</item>
+        <!-- Duration for more than one day -->
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> days</item>
+    </plurals>
 
-    <!-- Alarm confirmation toast: plural days -->
-    <string name="days">"<xliff:g id="days">%s</xliff:g> days"</string>
+    <!-- Alarm confirmation toast and timer notification: hours -->
+    <plurals name="hours">
+        <!-- Duration for one hour -->
+        <item quantity="one">1 hour</item>
+        <!-- Duration for more than one hour -->
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> hours</item>
+    </plurals>
 
-    <!-- Alarm confirmation toast: singular hour -->
-    <string name="hour">1 hour</string>
-
-    <!-- Alarm confirmation toast: plural hours -->
-    <string name="hours"><xliff:g id="hours">%s</xliff:g> hours</string>
-
-    <!-- Alarm confirmation toast: singular minute  -->
-    <string name="minute">"1 minute"</string>
-
-    <!-- Alarm confirmation toast: plural minutes  -->
-    <string name="minutes">"<xliff:g id="minutes">%s</xliff:g> minutes"</string>
+    <!-- Alarm confirmation toast and timer notification: minutes -->
+    <plurals name="minutes">
+        <!-- Duration for one minute -->
+        <item quantity="one">1 minute</item>
+        <!-- Duration for more than one minute -->
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> minutes</item>
+    </plurals>
 
     <!-- Repeat options that appear under an alarm on main Alarm Clock
          screen to identify repetition schedule: special case for when
@@ -225,7 +231,7 @@
         <!-- Duration for one minute -->
         <item quantity="one">1 minute</item>
         <!-- Duration for more than one minute -->
-        <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> minutes</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> minutes</item>
     </plurals>
 
     <plurals name="snooze_picker_label">
@@ -239,7 +245,13 @@
     <string name="auto_silence_title">Silence after</string>
 
     <!-- Auto silence summary string set based on the preference value. -->
-    <string name="auto_silence_summary"><xliff:g id="minutes">%d</xliff:g> minutes</string>
+    <plurals name="auto_silence_summary">
+        <!-- Duration for one minute -->
+        <item quantity="one">1 minute</item>
+        <!-- Duration for more than one minute -->
+        <item quantity="other"><xliff:g id="formatted_number" example="7">%s</xliff:g> minutes</item>
+    </plurals>
+
 
     <!-- Auto silence summary when turned off -->
     <string name="auto_silence_never">Never</string>
@@ -473,7 +485,7 @@
     </string-array>
 
     <!-- Label to enumerate the number of laps the user has counted -->
-    <string-array name="sw_lap_number_set" translatable="false">
+    <string-array name="sw_lap_number_set" translatable="true">
         <item># <xliff:g id="number">%d</xliff:g></item>
         <item># <xliff:g id="number">%02d</xliff:g></item>
     </string-array>
@@ -813,7 +825,7 @@
     <!-- Description of the button to undo change to alarm -->
     <string name="alarm_undo">undo</string>
     <!-- Toast content when an alarm was deleted  -->
-    <string name="alarm_deleted">Alarm deleted.</string>
+    <string name="alarm_deleted">Alarm deleted</string>
     <!-- slash between date and next alarm in the clock -->
     <string name="slash"> / </string>
     <!-- slash between date and next alarm in the clock -->
@@ -900,5 +912,188 @@
         Ex: EEE, k:mm = Mon, 2:55
     -->
     <string name="weekday_time_format_24_mode">EEE, k&#58;mm</string>
+
+    <!-- String that represents that invalid time for an alarm was specified, e.g. 23:00am
+     or 27:68pm.
+    First %d represents hour, second %d represents minutes,
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="invalid_time">Invalid time <xliff:g id="invalid_hour" example="25">%d</xliff:g>:<xliff:g id="invalid_minutes" example="63">%d</xliff:g> <xliff:g id="invalid_pmam" example="PM">%s</xliff:g></string>
+
+    <!-- String that represents that no alarm has been specified for a requested hour:minutes.
+    This happens when a user sends a voice command 'dismiss my alarm at 3:00pm' but they have no
+    alarms specified for that time. %s represents the time of the alarm.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="no_alarm_at">No alarm at <xliff:g id="alarm_time_hour" example="14">%d</xliff:g>:<xliff:g id="alarm_time_minutes" example="23">%d</xliff:g></string>
+
+    <!-- String that represents that the user doesn't have any alarms scheduled. This happens when
+    a user sends a voice command 'dismiss next alarm' or 'dismiss all of my alarms' but they have
+    no alarms scheduled in the app.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="no_scheduled_alarms">No scheduled alarms</string>
+
+    <!-- String that represents that the user has sent a voice command 'start a stopwatch' when
+    the stopwatch was already running so the command wasn't executed.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="stopwatch_already_running">Stopwatch is already running</string>
+
+    <!-- String that represents that the user has sent a voice command 'stop the stopwatch' or
+    'lap the stopwatch' when the stopwatch wasn't running so the command wasn't executed.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="stopwatch_isnt_running">Stopwatch isn\'t running</string>
+
+    <!-- String that represents that the user has successfully sent a voice command changing a mode
+     for the stopwatch and it was executed.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="stopwatch_mode_changed">Stopwatch mode changed</string>
+
+    <!-- String that represents that the user has sent a voice command 'dismiss my alarm at 3pm' when
+    there was no alarm scheduled for that time (they might have had an alarm for 3pm on the list
+    but it was disabled).
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="no_alarm_scheduled_for_this_time">No alarm scheduled for this time</string>
+
+    <!-- String that represents that the user has dismissed an alarm through a voice action.
+    %s represents alarm time, e.g. 14:20
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="alarm_is_dismissed"><xliff:g id="alarm_time" example="14:20">%s</xliff:g> alarm dismissed</string>
+
+    <!-- String that represents that the user has dismissed an alarm through a voice action.
+    %s represents alarm time, e.g. 14:20
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="alarm_is_set">Alarm is set for <xliff:g id="alarm_time" example="14:20">%s</xliff:g></string>
+
+    <!-- String that represents that the user attempted to send a voice action 'delete a timer'
+    when there were no timers available.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="no_timer_set">No timer set</string>
+
+    <!-- String that represents that the user has successfully deleted a timer through a voice action.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="timer_deleted">Timer deleted</string>
+
+    <!-- String that represents that the user has attempted to start a timer when a timer was
+    already running.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="timer_already_running">Timer already running</string>
+
+    <!-- String that represents that the user has attempted to start or reset a timer when
+     there were more than 1 timer of desired state in which case it's ambiguous
+     which timer the user meant.
+    [CHAR LIMIT=NONE]
+     -->
+    <string name="multiple_timers_available">Unable to complete your request, multiple timers available</string>
+
+    <!-- String that represents that the user has successfully started a timer through a voice action.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="timer_started">Timer started</string>
+
+    <!-- String that represents that the user has successfully created a timer through a voice action.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="timer_created">Timer created</string>
+
+    <!-- String that represents that the user attempted to start a timer through a voice action
+    but specified invalid length.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="invalid_timer_length">Invalid timer length</string>
+
+    <!-- String that represents that the user has successfully reset a timer through a voice action.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="timer_was_reset">Timer reset</string>
+
+    <!-- String that represents that the user attempted to reset a timer through a voice action but
+    the timer wasn't stopped (resetting is only allowed when a timer is stopped).
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="timer_cant_be_reset_because_its_running">Timer can\'t be reset because it\'s still running. Stop timer to reset.</string>
+
+    <!-- String that represents that the user attempted to stop a timer through a voice action but
+    the timer was already stopped (resetting is only allowed when a timer is stopped).
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="timer_already_stopped">Timer already stopped</string>
+
+    <!-- String that represents that the user attempted to add or delete a world clock through
+    a voice action
+    but they didn't specify a city so no world clock was selected.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="no_city_selected">No city selected</string>
+
+    <!-- String that represents that the user attempted to add or delete a world clock through
+    a voice action
+    but the city they specified wasn't listed in the database.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="the_city_you_specified_is_not_available">The city you specified is not available</string>
+
+    <!-- String that represents that the user attempted to add a world clock through a voice action
+    but the city they specified is already added to the list.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="the_city_already_added">That city has already been added</string>
+
+    <!-- String that represents that the user successfully added a world clock through a
+    voice action
+    %s represents the name of the city they added.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="city_added"><xliff:g id="city_name" example="Paris">%s</xliff:g> added</string>
+
+    <!-- String that represents that the user successfully deleted a world clock through
+    a voice action
+    %s represents the name of the city they deleted.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="city_deleted"><xliff:g id="city_name" example="Paris">%s</xliff:g> deleted</string>
+
+    <!-- String that represents that the user attempted to dismiss an alarm that is more than
+    2 hours away
+    %s represents the time of the alarm (e.g. 15:39)
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away"><xliff:g id="alarm_time" example="14:20">%s</xliff:g> alarm can\'t be dismissed yet, still more than 24 hours away</string>
+
+    <!-- String that shows up in the action bar for the Picker Activity
+         where a use gets to pick which alarm to dismiss
+   [CHAR LIMIT=NONE]
+   -->
+    <string name="dismiss_alarm">Dismiss alarm</string>
+
+    <!-- String that represents that further action is needed from the user in case their
+    voice command was ambiguous or there are more than 1 alarms that match their request.
+    The user needs to choose an alarm they want to dismiss through the UI
+   [CHAR LIMIT=NONE]
+   -->
+    <string name="pick_alarm_to_dismiss">Pick which alarm to dismiss</string>
+
+    <!-- String that represents that the user doesn't have any alarms firing at the moment.
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="no_firing_alarms">No firing alarms</string>
+
+    <!-- String that represents that the user has snoozed an alarm through a voice action for 10
+    minutes.
+    %s represents alarm time, e.g. 14:20
+    [CHAR LIMIT=NONE]
+    -->
+    <string name="alarm_is_snoozed"><xliff:g id="alarm_time" example="14:20">%s</xliff:g> alarm snoozed for 10 minutes</string>
+
+
 </resources>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4d12ea3..3a5345b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -25,7 +25,7 @@
     <style name="BaseActivityTheme" parent="Theme.AppCompat">
         <item name="android:imageButtonStyle">@style/ImageButtonStyle</item>
 
-        <!-- Attributes from support.v7.appcompat -->
+        <item name="alertDialogTheme">@style/AlertDialogTheme</item>
         <item name="colorAccent">@color/color_accent</item>
         <item name="colorPrimaryDark">@color/status_bar</item>
         <item name="colorControlActivated">@color/white</item>
@@ -42,6 +42,10 @@
         <item name="windowNoTitle">true</item>
     </style>
 
+    <style name="AlertDialogTheme" parent="Theme.AppCompat.Dialog.Alert">
+        <!-- Attributes from support.v7.appcompat -->
+        <item name="colorAccent">@color/color_accent</item>
+    </style>
 
     <style name="ControlAccentThemeOverlay">
         <!-- Attributes from support.v7.appcompat -->
@@ -93,7 +97,7 @@
         <item name="displayOptions"></item>
     </style>
 
-    <style name="SettingsTheme" parent="@style/BaseActivityTheme">
+    <style name="SettingsTheme" parent="BaseActivityTheme">
         <item name="android:detailsElementBackground">@null</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
@@ -109,7 +113,7 @@
         <item name="displayOptions">showTitle|homeAsUp</item>
     </style>
 
-    <style name="CitiesTheme" parent="@style/BaseActivityTheme">
+    <style name="CitiesTheme" parent="BaseActivityTheme">
         <item name="android:fastScrollPreviewBackgroundLeft">@drawable/fastscroll_preview</item>
         <item name="android:fastScrollPreviewBackgroundRight">@drawable/fastscroll_preview</item>
         <item name="android:fastScrollTextColor">@color/white</item>
@@ -242,6 +246,11 @@
         <item name="android:textSize">@dimen/body_font_size</item>
     </style>
 
+    <style name="undo_toast" parent="body">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">@color/color_accent</item>
+    </style>
+
     <style name="body_not_caps" parent="body">
         <item name="android:textAllCaps">false</item>
     </style>
@@ -267,14 +276,14 @@
         <item name="android:textSize">@dimen/label_text_size</item>
     </style>
 
-    <style name="PrimaryLabelTextAppearance" parent="@style/PrimaryLabelTextParentAppearance" />
+    <style name="PrimaryLabelTextAppearance" parent="PrimaryLabelTextParentAppearance" />
 
     <style name="SecondaryLabelTextParentAppearance">
         <item name="android:textColor">@color/white_69p</item>
         <item name="android:textSize">@dimen/label_text_size</item>
     </style>
 
-    <style name="SecondaryLabelTextAppearance" parent="@style/SecondaryLabelTextParentAppearance" />
+    <style name="SecondaryLabelTextAppearance" parent="SecondaryLabelTextParentAppearance" />
 
     <style name="TextAppearance">
         <item name="android:textSize">16sp</item>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index e8ff0fe..88cf3cd 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -52,11 +52,9 @@
             android:title="@string/snooze_duration_title"
             android:defaultValue="10"/>
 
-        <VolumePreference
+        <Preference
             android:key="volume_setting"
-            android:title="@string/alarm_volume_title"
-            android:dialogTitle="@string/alarm_volume_title"
-            android:streamType="alarm" />
+            android:title="@string/alarm_volume_title" />
 
         <ListPreference
             android:key="volume_button_setting"
diff --git a/src/com/android/deskclock/AlarmClockFragment.java b/src/com/android/deskclock/AlarmClockFragment.java
index 1b2b9a5..085c6f3 100644
--- a/src/com/android/deskclock/AlarmClockFragment.java
+++ b/src/com/android/deskclock/AlarmClockFragment.java
@@ -306,9 +306,6 @@
             setLeftRightButtonAppearance();
         }
 
-        if (mAdapter != null) {
-            mAdapter.notifyDataSetChanged();
-        }
         // Check if another app asked us to create a blank new alarm.
         final Intent intent = getActivity().getIntent();
         if (intent.hasExtra(ALARM_CREATE_NEW_INTENT_EXTRA)) {
@@ -765,7 +762,7 @@
             } else {
                 itemHolder.tomorrowLabel.setVisibility(View.VISIBLE);
                 final Resources resources = getResources();
-                final String labelText = isTomorrow(alarm) ?
+                final String labelText = Alarm.isTomorrow(alarm) ?
                         resources.getString(R.string.alarm_tomorrow) :
                         resources.getString(R.string.alarm_today);
                 itemHolder.tomorrowLabel.setText(labelText);
@@ -877,14 +874,6 @@
             return Color.rgb(red, green, blue);
         }
 
-        private boolean isTomorrow(Alarm alarm) {
-            final Calendar now = Calendar.getInstance();
-            final int alarmHour = alarm.hour;
-            final int currHour = now.get(Calendar.HOUR_OF_DAY);
-            return alarmHour < currHour ||
-                        (alarmHour == currHour && alarm.minutes <= now.get(Calendar.MINUTE));
-        }
-
         private void bindExpandArea(final ItemHolder itemHolder, final Alarm alarm) {
             // Views in here are not bound until the item is expanded.
 
diff --git a/src/com/android/deskclock/AlarmInitReceiver.java b/src/com/android/deskclock/AlarmInitReceiver.java
index ec5813a..4ff8b2b 100644
--- a/src/com/android/deskclock/AlarmInitReceiver.java
+++ b/src/com/android/deskclock/AlarmInitReceiver.java
@@ -58,6 +58,9 @@
                     TimerObj.resetTimersInSharedPrefs(prefs);
                     Utils.clearSwSharedPref(prefs);
 
+                    // Dismiss snoozed alarms after boot
+                    AlarmStateManager.dismissSnoozedAlarms(context);
+
                     if (!prefs.getBoolean(PREF_VOLUME_DEF_DONE, false)) {
                         // Fix the default
                         LogUtils.v("AlarmInitReceiver - resetting volume button default");
diff --git a/src/com/android/deskclock/AlarmSelectionActivity.java b/src/com/android/deskclock/AlarmSelectionActivity.java
new file mode 100644
index 0000000..85e258d
--- /dev/null
+++ b/src/com/android/deskclock/AlarmSelectionActivity.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.deskclock;
+
+import android.app.Activity;
+import android.app.ListActivity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.util.ArrayMap;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ListView;
+
+import com.android.deskclock.provider.Alarm;
+import com.android.deskclock.widget.selector.AlarmSelection;
+import com.android.deskclock.widget.selector.AlarmSelectionAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class AlarmSelectionActivity extends ListActivity {
+
+    public static final String EXTRA_ALARMS = "com.android.deskclock.EXTRA_ALARMS";
+
+    private final List<AlarmSelection> mSelections = new ArrayList<>();
+    private final Map<Long, Alarm> mAlarmsMap = new ArrayMap<>();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        // this activity is shown if:
+        // a) no search mode was specified in which case we show all
+        // enabled alarms
+        // b) if search mode was next and there was multiple alarms firing next
+        // (at the same time) then we only show those alarms firing at the same time
+        // c) if search mode was time and there are multiple alarms with that time
+        // then we only show those alarms with that time
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.selection_layout);
+
+        final Button cancelButton = (Button) findViewById(R.id.cancel_button);
+        cancelButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        final Intent intent = getIntent();
+        final Parcelable[] alarmsFromIntent = intent.getParcelableArrayExtra(EXTRA_ALARMS);
+
+        // reading alarms from intent
+        // PickSelection is started only if there are more than 1 relevant alarm
+        // so no need to check if alarmsFromIntent is empty
+        for (Parcelable parcelable : alarmsFromIntent) {
+            final Alarm alarm = (Alarm) parcelable;
+            mAlarmsMap.put(alarm.id, alarm);
+
+            // filling mSelections that go into the UI picker list
+            final String label = String.format("%d %02d", alarm.hour, alarm.minutes);
+            mSelections.add(new AlarmSelection(label, alarm));
+        }
+
+        setListAdapter(new AlarmSelectionAdapter(this, R.layout.alarm_row, mSelections));
+    }
+
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id) {
+        super.onListItemClick(l, v, position, id);
+        // id corresponds to mSelections id because the view adapter used mSelections
+        final AlarmSelection selection = mSelections.get((int) id);
+        final Alarm alarm = selection.getAlarm();
+        if (alarm != null) {
+            new ProcessAlarmActionAsync(this, alarm, this).execute();
+        }
+        finish();
+    }
+
+    private static class ProcessAlarmActionAsync extends AsyncTask<Void, Void, Void> {
+
+        private final Context mContext;
+        private final Alarm mAlarm;
+        private final Activity mActivity;
+
+        public ProcessAlarmActionAsync(Context context, Alarm alarm, Activity activity) {
+            mContext = context;
+            mAlarm = alarm;
+            mActivity = activity;
+        }
+
+        @Override
+        protected Void doInBackground(Void... parameters) {
+            HandleApiCalls.dismissAlarm(mAlarm, mContext, mActivity);
+            return null;
+        }
+    }
+}
diff --git a/src/com/android/deskclock/AlarmUtils.java b/src/com/android/deskclock/AlarmUtils.java
index 2e7faba..ad499fe 100644
--- a/src/com/android/deskclock/AlarmUtils.java
+++ b/src/com/android/deskclock/AlarmUtils.java
@@ -116,27 +116,20 @@
     }
 
     /**
-     * format "Alarm set for 2 days 7 hours and 53 minutes from
-     * now"
+     * format "Alarm set for 2 days 7 hours and 53 minutes from now"
      */
     private static String formatToast(Context context, long timeInMillis) {
-        long delta = timeInMillis - System.currentTimeMillis();
-        long hours = delta / (1000 * 60 * 60);
-        long minutes = delta / (1000 * 60) % 60;
-        long days = hours / 24;
+        final long delta = timeInMillis - System.currentTimeMillis();
+        int hours = (int) delta / (1000 * 60 * 60);
+        final int minutes = (int) delta / (1000 * 60) % 60;
+        final int days = hours / 24;
         hours = hours % 24;
 
-        String daySeq = (days == 0) ? "" :
-                (days == 1) ? context.getString(R.string.day) :
-                        context.getString(R.string.days, Long.toString(days));
+        String daySeq = Utils.getNumberFormattedQuantityString(context, R.plurals.days, days);
 
-        String minSeq = (minutes == 0) ? "" :
-                (minutes == 1) ? context.getString(R.string.minute) :
-                        context.getString(R.string.minutes, Long.toString(minutes));
+        String minSeq = Utils.getNumberFormattedQuantityString(context, R.plurals.minutes, minutes);
 
-        String hourSeq = (hours == 0) ? "" :
-                (hours == 1) ? context.getString(R.string.hour) :
-                        context.getString(R.string.hours, Long.toString(hours));
+        String hourSeq = Utils.getNumberFormattedQuantityString(context, R.plurals.hours, hours);
 
         boolean dispDays = days > 0;
         boolean dispHour = hours > 0;
diff --git a/src/com/android/deskclock/CircleTimerView.java b/src/com/android/deskclock/CircleTimerView.java
index fe341c1..83d0cc7 100644
--- a/src/com/android/deskclock/CircleTimerView.java
+++ b/src/com/android/deskclock/CircleTimerView.java
@@ -193,7 +193,7 @@
             drawRedDot(canvas, redPercent, xCenter, yCenter, radius);
         }
         if (mAnimate) {
-            invalidate();
+            postInvalidateOnAnimation();
         }
    }
 
diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index 271382a..f2f4e71 100644
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java
@@ -27,6 +27,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.annotation.VisibleForTesting;
 import android.support.v13.app.FragmentPagerAdapter;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.ViewPager;
@@ -152,7 +153,8 @@
         mActionBar.setSelectedNavigationItem(mSelectedTab);
     }
 
-    private DeskClockFragment getSelectedFragment() {
+    @VisibleForTesting
+    DeskClockFragment getSelectedFragment() {
         return (DeskClockFragment) mTabsAdapter.getItem(getRtlPosition(mSelectedTab));
     }
 
diff --git a/src/com/android/deskclock/FetchMatchingAlarmsAction.java b/src/com/android/deskclock/FetchMatchingAlarmsAction.java
new file mode 100644
index 0000000..80790be
--- /dev/null
+++ b/src/com/android/deskclock/FetchMatchingAlarmsAction.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.deskclock;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Looper;
+import android.provider.AlarmClock;
+
+import com.android.deskclock.alarms.AlarmStateManager;
+import com.android.deskclock.provider.Alarm;
+import com.android.deskclock.provider.AlarmInstance;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+/**
+ * Returns a list of alarms that are specified by the intent
+ * processed by HandleDeskClockApiCalls
+ * if there are more than 1 matching alarms and the SEARCH_MODE is not ALL
+ * we show a picker UI dialog
+ */
+class FetchMatchingAlarmsAction implements Runnable {
+
+    private final Context mContext;
+    private final List<Alarm> mAlarms;
+    private final Intent mIntent;
+    private final List<Alarm> mMatchingAlarms = new ArrayList<>();
+    private final Activity mActivity;
+
+    public FetchMatchingAlarmsAction(Context context, List<Alarm> alarms, Intent intent,
+                                     Activity activity) {
+        mContext = context;
+        // only enabled alarms are passed
+        mAlarms = alarms;
+        mIntent = intent;
+        mActivity = activity;
+    }
+
+    @Override
+    public void run() {
+        // only allow on background thread
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            throw new IllegalStateException("Must be called on a background thread");
+        }
+
+        final String searchMode = mIntent.getStringExtra(AlarmClock.EXTRA_ALARM_SEARCH_MODE);
+        // if search mode isn't specified show all alarms in the UI picker
+        if (searchMode == null) {
+            mMatchingAlarms.addAll(mAlarms);
+            return;
+        }
+
+        final ContentResolver cr = mContext.getContentResolver();
+        switch (searchMode) {
+            case AlarmClock.ALARM_SEARCH_MODE_TIME:
+                // at least one of these has to be specified in this search mode.
+                final int hour = mIntent.getIntExtra(AlarmClock.EXTRA_HOUR, -1);
+                // if minutes weren't specified default to 0
+                final int minutes = mIntent.getIntExtra(AlarmClock.EXTRA_MINUTES, 0);
+                final Boolean isPm = (Boolean) mIntent.getExtras().get(AlarmClock.EXTRA_IS_PM);
+                boolean badInput = isPm != null && hour > 12 && isPm;
+                badInput |= hour < 0 || hour > 23;
+                badInput |= minutes < 0 || minutes > 59;
+
+                if (badInput) {
+                    final String amPm = isPm == null ? "null" : (isPm ? "pm" : "am");
+                    final String reason = mContext.getString(R.string.invalid_time, hour, minutes,
+                            amPm);
+                    notifyFailureAndLog(reason, mActivity);
+                    return;
+                }
+
+                final int hour24 = Boolean.TRUE.equals(isPm) && hour < 12 ? (hour + 12) : hour;
+
+                final List<Alarm> selectedAlarms = new ArrayList<>();
+                for (Alarm alarm : mAlarms) {
+                    if (alarm.hour == hour24 && alarm.minutes == minutes) {
+                        selectedAlarms.add(alarm);
+                    }
+                }
+                if (selectedAlarms.isEmpty()) {
+                    final String reason = mContext.getString(R.string.no_alarm_at, hour24, minutes);
+                    notifyFailureAndLog(reason, mActivity);
+                    return;
+                }
+                // there might me multiple alarms at the same time
+                mMatchingAlarms.addAll(selectedAlarms);
+                break;
+            case AlarmClock.ALARM_SEARCH_MODE_NEXT:
+                final AlarmInstance nextAlarm = AlarmStateManager.getNextFiringAlarm(mContext);
+                if (nextAlarm == null) {
+                    final String reason = mContext.getString(R.string.no_scheduled_alarms);
+                    notifyFailureAndLog(reason, mActivity);
+                    return;
+                }
+
+                // get time from nextAlarm and see if there are any other alarms matching this time
+                final Calendar nextTime = nextAlarm.getAlarmTime();
+                final List<Alarm> alarmsFiringAtSameTime = getAlarmsByHourMinutes(
+                        nextTime.get(Calendar.HOUR_OF_DAY), nextTime.get(Calendar.MINUTE), cr);
+                // there might me multiple alarms firing next
+                mMatchingAlarms.addAll(alarmsFiringAtSameTime);
+                break;
+            case AlarmClock.ALARM_SEARCH_MODE_ALL:
+                mMatchingAlarms.addAll(mAlarms);
+                break;
+        }
+    }
+
+    private List<Alarm> getAlarmsByHourMinutes(int hour24, int minutes, ContentResolver cr) {
+        // if we want to dismiss we should only add enabled alarms
+        final String selection = String.format("%s=? AND %s=? AND %s=?",
+                Alarm.HOUR, Alarm.MINUTES, Alarm.ENABLED);
+        final String[] args = { String.valueOf(hour24), String.valueOf(minutes), "1" };
+        return Alarm.getAlarms(cr, selection, args);
+    }
+
+    public List<Alarm> getMatchingAlarms() {
+        return mMatchingAlarms;
+    }
+
+    private void notifyFailureAndLog(String reason, Activity activity) {
+        LogUtils.e(reason);
+        Voice.notifyFailure(activity, reason);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/deskclock/HandleApiCalls.java b/src/com/android/deskclock/HandleApiCalls.java
index 4110e78..03580a4 100644
--- a/src/com/android/deskclock/HandleApiCalls.java
+++ b/src/com/android/deskclock/HandleApiCalls.java
@@ -18,13 +18,19 @@
 
 import android.app.Activity;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.media.RingtoneManager;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Looper;
+import android.os.Parcelable;
 import android.preference.PreferenceManager;
+import android.provider.AlarmClock;
 import android.text.TextUtils;
+import android.text.format.DateFormat;
 
 import com.android.deskclock.alarms.AlarmStateManager;
 import com.android.deskclock.events.Events;
@@ -37,57 +43,230 @@
 
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Iterator;
 import java.util.List;
 
-import static android.provider.AlarmClock.ACTION_SET_ALARM;
-import static android.provider.AlarmClock.ACTION_SET_TIMER;
-import static android.provider.AlarmClock.ACTION_SHOW_ALARMS;
-import static android.provider.AlarmClock.EXTRA_DAYS;
-import static android.provider.AlarmClock.EXTRA_HOUR;
-import static android.provider.AlarmClock.EXTRA_LENGTH;
-import static android.provider.AlarmClock.EXTRA_MESSAGE;
-import static android.provider.AlarmClock.EXTRA_MINUTES;
-import static android.provider.AlarmClock.EXTRA_RINGTONE;
-import static android.provider.AlarmClock.EXTRA_SKIP_UI;
-import static android.provider.AlarmClock.EXTRA_VIBRATE;
-import static android.provider.AlarmClock.VALUE_RINGTONE_SILENT;
-
 public class HandleApiCalls extends Activity {
 
     public static final long TIMER_MIN_LENGTH = 1000;
     public static final long TIMER_MAX_LENGTH = 24 * 60 * 60 * 1000;
 
+    private Context mAppContext;
+
     @Override
     protected void onCreate(Bundle icicle) {
         try {
             super.onCreate(icicle);
-            Intent intent = getIntent();
-            if (intent != null) {
-                if (ACTION_SET_ALARM.equals(intent.getAction())) {
+            mAppContext = getApplicationContext();
+            final Intent intent = getIntent();
+            final String action = intent == null ? null : intent.getAction();
+            if (action == null) {
+                return;
+            }
+            switch (action) {
+                case AlarmClock.ACTION_SET_ALARM:
                     handleSetAlarm(intent);
-                } else if (ACTION_SHOW_ALARMS.equals(intent.getAction())) {
+                    break;
+                case AlarmClock.ACTION_SHOW_ALARMS:
                     handleShowAlarms();
-                } else if (ACTION_SET_TIMER.equals(intent.getAction())) {
+                    break;
+                case AlarmClock.ACTION_SET_TIMER:
                     handleSetTimer(intent);
-                }
+                    break;
+                case AlarmClock.ACTION_DISMISS_ALARM:
+                    handleDismissAlarm(intent.getAction());
+                    break;
+                case AlarmClock.ACTION_SNOOZE_ALARM:
+                    handleSnoozeAlarm();
             }
         } finally {
             finish();
         }
     }
 
+    private void handleDismissAlarm(final String action) {
+        // Opens the UI for Alarms
+        final Intent alarmIntent =
+                Alarm.createIntent(mAppContext, DeskClock.class, Alarm.INVALID_ID)
+                        .setAction(action)
+                        .putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.ALARM_TAB_INDEX);
+        startActivity(alarmIntent);
+
+        final Intent intent = getIntent();
+
+        new DismissAlarmAsync(mAppContext, intent, this).execute();
+    }
+
+    public static void dismissAlarm(Alarm alarm, Context context, Activity activity) {
+        // only allow on background thread
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            throw new IllegalStateException("dismissAlarm must be called on a " +
+                    "background thread");
+        }
+
+        final AlarmInstance alarmInstance = AlarmInstance.getNextUpcomingInstanceByAlarmId(
+                context.getContentResolver(), alarm.id);
+        if (alarmInstance == null) {
+            final String reason = context.getString(R.string.no_alarm_scheduled_for_this_time);
+            Voice.notifyFailure(activity, reason);
+            LogUtils.i(reason);
+            return;
+        }
+
+        final String time = DateFormat.getTimeFormat(context).format(
+                alarmInstance.getAlarmTime().getTime());
+        if (Utils.isAlarmWithin24Hours(alarmInstance)) {
+            AlarmStateManager.setPreDismissState(context, alarmInstance);
+            final String reason = context.getString(R.string.alarm_is_dismissed, time);
+            LogUtils.i(reason);
+            Voice.notifySuccess(activity, reason);
+            Events.sendAlarmEvent(R.string.action_dismiss, R.string.label_intent);
+        } else {
+            final String reason = context.getString(
+                    R.string.alarm_cant_be_dismissed_still_more_than_24_hours_away, time);
+            Voice.notifyFailure(activity, reason);
+            LogUtils.i(reason);
+        }
+    }
+
+    private static class DismissAlarmAsync extends AsyncTask<Void, Void, Void> {
+
+        private final Context mContext;
+        private final Intent mIntent;
+        private final Activity mActivity;
+
+        public DismissAlarmAsync(Context context, Intent intent, Activity activity) {
+            mContext = context;
+            mIntent = intent;
+            mActivity = activity;
+        }
+
+        @Override
+        protected Void doInBackground(Void... parameters) {
+            final List<Alarm> alarms = getEnabledAlarms(mContext);
+            if (alarms.isEmpty()) {
+                final String reason = mContext.getString(R.string.no_scheduled_alarms);
+                LogUtils.i(reason);
+                Voice.notifyFailure(mActivity, reason);
+                return null;
+            }
+
+            // remove Alarms in MISSED, DISMISSED, and PREDISMISSED states
+            for (Iterator<Alarm> i = alarms.iterator(); i.hasNext();) {
+                final AlarmInstance alarmInstance = AlarmInstance.getNextUpcomingInstanceByAlarmId(
+                        mContext.getContentResolver(), i.next().id);
+                if (alarmInstance == null ||
+                        alarmInstance.mAlarmState > AlarmInstance.FIRED_STATE) {
+                    i.remove();
+                }
+            }
+
+            final String searchMode = mIntent.getStringExtra(AlarmClock.EXTRA_ALARM_SEARCH_MODE);
+            if (searchMode == null && alarms.size() > 1) {
+                // shows the UI where user picks which alarm they want to DISMISS
+                final Intent pickSelectionIntent = new Intent(mContext,
+                        AlarmSelectionActivity.class)
+                        .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .putExtra(AlarmSelectionActivity.EXTRA_ALARMS,
+                                alarms.toArray(new Parcelable[alarms.size()]));
+                mContext.startActivity(pickSelectionIntent);
+                Voice.notifySuccess(mActivity, mContext.getString(R.string.pick_alarm_to_dismiss));
+                return null;
+            }
+
+            // fetch the alarms that are specified by the intent
+            final FetchMatchingAlarmsAction fmaa =
+                    new FetchMatchingAlarmsAction(mContext, alarms, mIntent, mActivity);
+            fmaa.run();
+            final List<Alarm> matchingAlarms = fmaa.getMatchingAlarms();
+
+            // If there are multiple matching alarms and it wasn't expected
+            // disambiguate what the user meant
+            if (!AlarmClock.ALARM_SEARCH_MODE_ALL.equals(searchMode) && matchingAlarms.size() > 1) {
+              final Intent pickSelectionIntent = new Intent(mContext, AlarmSelectionActivity.class)
+                        .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .putExtra(AlarmSelectionActivity.EXTRA_ALARMS,
+                                matchingAlarms.toArray(new Parcelable[matchingAlarms.size()]));
+                mContext.startActivity(pickSelectionIntent);
+                Voice.notifySuccess(mActivity, mContext.getString(R.string.pick_alarm_to_dismiss));
+                return null;
+            }
+
+            // Apply the action to the matching alarms
+            for (Alarm alarm : matchingAlarms) {
+                dismissAlarm(alarm, mContext, mActivity);
+                LogUtils.i("Alarm %s is dismissed", alarm);
+            }
+            return null;
+        }
+
+        private static List<Alarm> getEnabledAlarms(Context context) {
+            final String selection = String.format("%s=?", Alarm.ENABLED);
+            final String[] args = { "1" };
+            return Alarm.getAlarms(context.getContentResolver(), selection, args);
+        }
+    }
+
+    private void handleSnoozeAlarm() {
+        new SnoozeAlarmAsync(mAppContext, this).execute();
+    }
+
+    private static class SnoozeAlarmAsync extends AsyncTask<Void, Void, Void> {
+
+        private final Context mContext;
+        private final Activity mActivity;
+
+        public SnoozeAlarmAsync(Context context, Activity activity) {
+            mContext = context;
+            mActivity = activity;
+        }
+
+        @Override
+        protected Void doInBackground(Void... parameters) {
+            final List<AlarmInstance> alarmInstances = AlarmInstance.getInstancesByState(
+                    mContext.getContentResolver(), AlarmInstance.FIRED_STATE);
+            if (alarmInstances.isEmpty()) {
+                final String reason = mContext.getString(R.string.no_firing_alarms);
+                LogUtils.i(reason);
+                Voice.notifyFailure(mActivity, reason);
+                return null;
+            }
+
+            for (AlarmInstance firingAlarmInstance : alarmInstances) {
+                snoozeAlarm(firingAlarmInstance, mContext, mActivity);
+            }
+            return null;
+        }
+    }
+
+    static void snoozeAlarm(AlarmInstance alarmInstance, Context context, Activity activity) {
+        // only allow on background thread
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            throw new IllegalStateException("snoozeAlarm must be called on a " +
+                    "background thread");
+        }
+        final String time = DateFormat.getTimeFormat(context).format(
+                alarmInstance.getAlarmTime().getTime());
+        final String reason = context.getString(R.string.alarm_is_snoozed, time);
+        LogUtils.i(reason);
+        Voice.notifySuccess(activity, reason);
+        AlarmStateManager.setSnoozeState(context, alarmInstance, true);
+        LogUtils.i("Snooze %d:%d", alarmInstance.mHour, alarmInstance.mMinute);
+        Events.sendAlarmEvent(R.string.action_snooze, R.string.label_intent);
+    }
+
     /***
      * Processes the SET_ALARM intent
-     * @param intent
+     * @param intent Intent passed to the app
      */
     private void handleSetAlarm(Intent intent) {
         // If not provided or invalid, show UI
-        final int hour = intent.getIntExtra(EXTRA_HOUR, -1);
+        final int hour = intent.getIntExtra(AlarmClock.EXTRA_HOUR, -1);
 
         // If not provided, use zero. If it is provided, make sure it's valid, otherwise, show UI
         final int minutes;
-        if (intent.hasExtra(EXTRA_MINUTES)) {
-            minutes = intent.getIntExtra(EXTRA_MINUTES, -1);
+        if (intent.hasExtra(AlarmClock.EXTRA_MINUTES)) {
+            minutes = intent.getIntExtra(AlarmClock.EXTRA_MINUTES, -1);
         } else {
             minutes = 0;
         }
@@ -98,38 +277,22 @@
             createAlarm.putExtra(AlarmClockFragment.ALARM_CREATE_NEW_INTENT_EXTRA, true);
             createAlarm.putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.ALARM_TAB_INDEX);
             startActivity(createAlarm);
+            Voice.notifyFailure(this, getString(R.string.invalid_time, hour, minutes, " "));
             LogUtils.i("HandleApiCalls no/invalid time; opening UI");
             return;
         }
 
-        final boolean skipUi = intent.getBooleanExtra(EXTRA_SKIP_UI, false);
+        Events.sendAlarmEvent(R.string.action_create, R.string.label_intent);
+        final boolean skipUi = intent.getBooleanExtra(AlarmClock.EXTRA_SKIP_UI, false);
 
         final StringBuilder selection = new StringBuilder();
         final List<String> args = new ArrayList<>();
         setSelectionFromIntent(intent, hour, minutes, selection, args);
 
-        // Check if the alarm already exists and handle it
-        final ContentResolver cr = getContentResolver();
-        final List<Alarm> alarms = Alarm.getAlarms(cr,
-                selection.toString(),
-                args.toArray(new String[args.size()]));
-        if (!alarms.isEmpty()) {
-            Alarm alarm = alarms.get(0);
-            alarm.enabled = true;
-            Alarm.updateAlarm(cr, alarm);
-
-            // Delete all old instances and create a new one with updated values
-            AlarmStateManager.deleteAllInstances(this, alarm.id);
-            setupInstance(alarm.createInstanceAfter(Calendar.getInstance()), skipUi);
-            LogUtils.i("HandleApiCalls deleted old, created new alarm: %s", alarm);
-            return;
-        }
-
-        // Otherwise insert it and handle it
         final String message = getMessageFromIntent(intent);
         final DaysOfWeek daysOfWeek = getDaysFromIntent(intent);
-        final boolean vibrate = intent.getBooleanExtra(EXTRA_VIBRATE, false);
-        final String alert = intent.getStringExtra(EXTRA_RINGTONE);
+        final boolean vibrate = intent.getBooleanExtra(AlarmClock.EXTRA_VIBRATE, false);
+        final String alert = intent.getStringExtra(AlarmClock.EXTRA_RINGTONE);
 
         Alarm alarm = new Alarm(hour, minutes);
         alarm.enabled = true;
@@ -139,15 +302,20 @@
 
         if (alert == null) {
             alarm.alert = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM);
-        } else if (VALUE_RINGTONE_SILENT.equals(alert) || alert.isEmpty()) {
+        } else if (AlarmClock.VALUE_RINGTONE_SILENT.equals(alert) || alert.isEmpty()) {
             alarm.alert = Alarm.NO_RINGTONE_URI;
         } else {
             alarm.alert = Uri.parse(alert);
         }
         alarm.deleteAfterUse = !daysOfWeek.isRepeating() && skipUi;
 
+        final ContentResolver cr = getContentResolver();
         alarm = Alarm.addAlarm(cr, alarm);
-        setupInstance(alarm.createInstanceAfter(Calendar.getInstance()), skipUi);
+        final AlarmInstance alarmInstance = alarm.createInstanceAfter(Calendar.getInstance());
+        setupInstance(alarmInstance, skipUi);
+        final String time = DateFormat.getTimeFormat(mAppContext).format(
+                alarmInstance.getAlarmTime().getTime());
+        Voice.notifySuccess(this, getString(R.string.alarm_is_set, time));
         LogUtils.i("HandleApiCalls set up alarm: %s", alarm);
     }
 
@@ -161,7 +329,7 @@
     private void handleSetTimer(Intent intent) {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         // If no length is supplied, show the timer setup view
-        if (!intent.hasExtra(EXTRA_LENGTH)) {
+        if (!intent.hasExtra(AlarmClock.EXTRA_LENGTH)) {
             startActivity(new Intent(this, DeskClock.class)
                   .putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.TIMER_TAB_INDEX)
                   .putExtra(TimerFullScreenFragment.GOTO_SETUP_VIEW, true));
@@ -169,8 +337,9 @@
             return;
         }
 
-        final long length = 1000l * intent.getIntExtra(EXTRA_LENGTH, 0);
+        final long length = 1000l * intent.getIntExtra(AlarmClock.EXTRA_LENGTH, 0);
         if (length < TIMER_MIN_LENGTH || length > TIMER_MAX_LENGTH) {
+            Voice.notifyFailure(this, getString(R.string.invalid_timer_length));
             LogUtils.i("Invalid timer length requested: " + length);
             return;
         }
@@ -188,7 +357,7 @@
             }
         }
 
-        boolean skipUi = intent.getBooleanExtra(EXTRA_SKIP_UI, false);
+        boolean skipUi = intent.getBooleanExtra(AlarmClock.EXTRA_SKIP_UI, false);
         if (timer == null) {
             // Use a new timer
             timer = new TimerObj(length, label, this /* context */);
@@ -215,6 +384,7 @@
                     .putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.TIMER_TAB_INDEX)
                     .putExtra(Timers.FIRST_LAUNCH_FROM_API_CALL, true));
         }
+        Voice.notifySuccess(this, getString(R.string.timer_created));
         LogUtils.i("HandleApiCalls timer created: %s", timer);
     }
 
@@ -232,13 +402,13 @@
     }
 
     private String getMessageFromIntent(Intent intent) {
-        final String message = intent.getStringExtra(EXTRA_MESSAGE);
+        final String message = intent.getStringExtra(AlarmClock.EXTRA_MESSAGE);
         return message == null ? "" : message;
     }
 
     private DaysOfWeek getDaysFromIntent(Intent intent) {
         final DaysOfWeek daysOfWeek = new DaysOfWeek(0);
-        final ArrayList<Integer> days = intent.getIntegerArrayListExtra(EXTRA_DAYS);
+        final ArrayList<Integer> days = intent.getIntegerArrayListExtra(AlarmClock.EXTRA_DAYS);
         if (days != null) {
             final int[] daysArray = new int[days.size()];
             for (int i = 0; i < days.size(); i++) {
@@ -247,7 +417,7 @@
             daysOfWeek.setDaysOfWeek(true, daysArray);
         } else {
             // API says to use an ArrayList<Integer> but we allow the user to use a int[] too.
-            final int[] daysArray = intent.getIntArrayExtra(EXTRA_DAYS);
+            final int[] daysArray = intent.getIntArrayExtra(AlarmClock.EXTRA_DAYS);
             if (daysArray != null) {
                 daysOfWeek.setDaysOfWeek(true, daysArray);
             }
@@ -266,7 +436,7 @@
         selection.append(" AND ").append(Alarm.MINUTES).append("=?");
         args.add(String.valueOf(minutes));
 
-        if (intent.hasExtra(EXTRA_MESSAGE)) {
+        if (intent.hasExtra(AlarmClock.EXTRA_MESSAGE)) {
             selection.append(" AND ").append(Alarm.LABEL).append("=?");
             args.add(getMessageFromIntent(intent));
         }
@@ -274,23 +444,23 @@
         // Days is treated differently that other fields because if days is not specified, it
         // explicitly means "not recurring".
         selection.append(" AND ").append(Alarm.DAYS_OF_WEEK).append("=?");
-        args.add(String.valueOf(intent.hasExtra(EXTRA_DAYS)
+        args.add(String.valueOf(intent.hasExtra(AlarmClock.EXTRA_DAYS)
                 ? getDaysFromIntent(intent).getBitSet() : DaysOfWeek.NO_DAYS_SET));
 
-        if (intent.hasExtra(EXTRA_VIBRATE)) {
+        if (intent.hasExtra(AlarmClock.EXTRA_VIBRATE)) {
             selection.append(" AND ").append(Alarm.VIBRATE).append("=?");
-            args.add(intent.getBooleanExtra(EXTRA_VIBRATE, false) ? "1" : "0");
+            args.add(intent.getBooleanExtra(AlarmClock.EXTRA_VIBRATE, false) ? "1" : "0");
         }
 
-        if (intent.hasExtra(EXTRA_RINGTONE)) {
+        if (intent.hasExtra(AlarmClock.EXTRA_RINGTONE)) {
             selection.append(" AND ").append(Alarm.RINGTONE).append("=?");
 
-            String ringTone = intent.getStringExtra(EXTRA_RINGTONE);
+            String ringTone = intent.getStringExtra(AlarmClock.EXTRA_RINGTONE);
             if (ringTone == null) {
                 // If the intent explicitly specified a NULL ringtone, treat it as the default
                 // ringtone.
                 ringTone = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM).toString();
-            } else if (VALUE_RINGTONE_SILENT.equals(ringTone) || ringTone.isEmpty()) {
+            } else if (AlarmClock.VALUE_RINGTONE_SILENT.equals(ringTone) || ringTone.isEmpty()) {
                     ringTone = Alarm.NO_RINGTONE;
             }
             args.add(ringTone);
diff --git a/src/com/android/deskclock/HandleDeskClockApiCalls.java b/src/com/android/deskclock/HandleDeskClockApiCalls.java
new file mode 100644
index 0000000..89bd85d
--- /dev/null
+++ b/src/com/android/deskclock/HandleDeskClockApiCalls.java
@@ -0,0 +1,469 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.deskclock;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+
+import com.android.deskclock.events.Events;
+import com.android.deskclock.stopwatch.StopwatchService;
+import com.android.deskclock.stopwatch.Stopwatches;
+import com.android.deskclock.timer.TimerFullScreenFragment;
+import com.android.deskclock.timer.TimerObj;
+import com.android.deskclock.worldclock.Cities;
+import com.android.deskclock.worldclock.CitiesActivity;
+import com.android.deskclock.worldclock.CityObj;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class HandleDeskClockApiCalls extends Activity {
+    private Context mAppContext;
+
+    private static final String ACTION_PREFIX = "com.android.deskclock.action.";
+
+    // shows the tab with world clocks
+    public static final String ACTION_SHOW_CLOCK = ACTION_PREFIX + "SHOW_CLOCK";
+    // add a clock of a selected city, if no city is specified opens the city selection screen
+    public static final String ACTION_ADD_CLOCK = ACTION_PREFIX + "ADD_CLOCK";
+    // delete a clock of a selected city, if no city is specified shows CitiesActivity for the user
+    // to choose a city
+    public static final String ACTION_DELETE_CLOCK = ACTION_PREFIX + "DELETE_CLOCK";
+    // extra for ACTION_ADD_CLOCK and ACTION_DELETE_CLOCK
+    public static final String EXTRA_CITY = "com.android.deskclock.extra.clock.CITY";
+
+    // shows the tab with the stopwatch
+    public static final String ACTION_SHOW_STOPWATCH = ACTION_PREFIX + "SHOW_STOPWATCH";
+    // starts the current stopwatch
+    public static final String ACTION_START_STOPWATCH = ACTION_PREFIX + "START_STOPWATCH";
+    // stops the current stopwatch
+    public static final String ACTION_STOP_STOPWATCH = ACTION_PREFIX + "STOP_STOPWATCH";
+    // laps the stopwatch that's currently running
+    public static final String ACTION_LAP_STOPWATCH = ACTION_PREFIX + "LAP_STOPWATCH";
+    // resets the stopwatch if it's stopped
+    public static final String ACTION_RESET_STOPWATCH = ACTION_PREFIX + "RESET_STOPWATCH";
+
+    // shows the tab with timers
+    public static final String ACTION_SHOW_TIMERS = ACTION_PREFIX + "SHOW_TIMERS";
+    // deletes the topmost timer
+    public static final String ACTION_DELETE_TIMER = ACTION_PREFIX + "DELETE_TIMER";
+    // stops the running timer
+    public static final String ACTION_STOP_TIMER = ACTION_PREFIX + "STOP_TIMER";
+    // starts the topmost timer
+    public static final String ACTION_START_TIMER = ACTION_PREFIX + "START_TIMER";
+    // resets the timer, works for both running and stopped
+    public static final String ACTION_RESET_TIMER = ACTION_PREFIX + "RESET_TIMER";
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        try {
+            super.onCreate(icicle);
+            mAppContext = getApplicationContext();
+
+            final Intent intent = getIntent();
+            if (intent == null) {
+                return;
+            }
+
+            final String action = intent.getAction();
+            switch (action) {
+                case ACTION_START_STOPWATCH:
+                case ACTION_STOP_STOPWATCH:
+                case ACTION_LAP_STOPWATCH:
+                case ACTION_SHOW_STOPWATCH:
+                case ACTION_RESET_STOPWATCH:
+                    handleStopwatchIntent(action);
+                    break;
+                case ACTION_SHOW_TIMERS:
+                case ACTION_DELETE_TIMER:
+                case ACTION_RESET_TIMER:
+                case ACTION_STOP_TIMER:
+                case ACTION_START_TIMER:
+                    handleTimerIntent(action);
+                    break;
+                case ACTION_SHOW_CLOCK:
+                case ACTION_ADD_CLOCK:
+                case ACTION_DELETE_CLOCK:
+                    handleClockIntent(action);
+                    break;
+            }
+        } finally {
+            finish();
+        }
+    }
+
+    private void handleStopwatchIntent(String action) {
+        // Opens the UI for stopwatch
+        final Intent stopwatchIntent = new Intent(mAppContext, DeskClock.class)
+                .setAction(action)
+                .putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.STOPWATCH_TAB_INDEX);
+        startActivity(stopwatchIntent);
+        LogUtils.i("HandleDeskClockApiCalls " + action);
+
+        // checking if the stopwatch is already running
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mAppContext);
+        final boolean stopwatchAlreadyRunning =
+                prefs.getBoolean(Stopwatches.NOTIF_CLOCK_RUNNING, false);
+
+        if (stopwatchAlreadyRunning) {
+            // don't fire START_STOPWATCH or RESET_STOPWATCH if a stopwatch is already running
+            if (ACTION_START_STOPWATCH.equals(action) ||
+                    ACTION_RESET_STOPWATCH.equals(action)) {
+                final String reason = getString(R.string.stopwatch_already_running);
+                Voice.notifyFailure(this, reason);
+                LogUtils.i(reason);
+                return;
+            }
+        } else {
+            // if a stopwatch isn't running, don't try to stop or lap it
+            if (ACTION_STOP_STOPWATCH.equals(action) ||
+                    ACTION_LAP_STOPWATCH.equals(action)) {
+                final String reason = getString(R.string.stopwatch_isnt_running);
+                Voice.notifyFailure(this, reason);
+                LogUtils.i(reason);
+                return;
+            }
+        }
+
+        // Events setup
+        switch (action) {
+            case ACTION_START_STOPWATCH:
+                Events.sendStopwatchEvent(R.string.action_start, R.string.label_intent);
+                LogUtils.i("Stopwatch was started.");
+                break;
+            case ACTION_STOP_STOPWATCH:
+                Events.sendStopwatchEvent(R.string.action_stop, R.string.label_intent);
+                LogUtils.i("Stopwatch was stopped.");
+                break;
+            case ACTION_LAP_STOPWATCH:
+                Events.sendStopwatchEvent(R.string.action_lap, R.string.label_intent);
+                LogUtils.i("Stopwatch was lapped.");
+                break;
+            case ACTION_SHOW_STOPWATCH:
+                Events.sendStopwatchEvent(R.string.action_show, R.string.label_intent);
+                LogUtils.i("Stopwatch tab was shown.");
+                break;
+            case ACTION_RESET_STOPWATCH:
+                Events.sendStopwatchEvent(R.string.action_reset, R.string.label_intent);
+                LogUtils.i("Stopwatch was reset.");
+                break;
+            default:
+                return;
+        }
+        final Intent intent = new Intent(mAppContext, StopwatchService.class).setAction(action);
+        startService(intent);
+        final String reason = getString(R.string.stopwatch_mode_changed);
+        Voice.notifySuccess(this, reason);
+        LogUtils.i(reason);
+    }
+
+    private void handleTimerIntent(final String action) {
+        // Opens the UI for timers
+        final Intent timerIntent = new Intent(mAppContext, DeskClock.class)
+                .putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.TIMER_TAB_INDEX)
+                .putExtra(TimerFullScreenFragment.GOTO_SETUP_VIEW, false);
+        startActivity(timerIntent);
+        LogUtils.i("HandleDeskClockApiCalls " + action);
+
+        if (ACTION_SHOW_TIMERS.equals(action)) {
+            Events.sendTimerEvent(R.string.action_show, R.string.label_intent);
+            return;
+        }
+        new HandleTimersAsync(mAppContext, action, this).execute();
+    }
+
+    private void handleClockIntent(final String action) {
+        // Opens the UI for clocks
+        final Intent handleClock = new Intent(mAppContext, DeskClock.class)
+                .setAction(action)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                .putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.CLOCK_TAB_INDEX);
+        startActivity(handleClock);
+
+        new HandleClockAsync(mAppContext, getIntent(), this).execute();
+    }
+
+    private static class HandleTimersAsync extends AsyncTask<Void, Void, Void> {
+        private final Context mContext;
+        private final String mAction;
+        private final Activity mActivity;
+
+        public HandleTimersAsync(Context context, String action, Activity activity) {
+            mContext = context;
+            mAction = action;
+            mActivity = activity;
+        }
+        // STOP_TIMER and START_TIMER should only be triggered if there is one timer that is
+        // not stopped or not started respectively. This method checks all timers to find only
+        // one that corresponds to that.
+        // Only change the mode of the timer if no disambiguation is necessary
+
+        @Override
+        protected Void doInBackground(Void... parameters) {
+            final List<TimerObj> timers = new ArrayList<>();
+            final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
+            TimerObj.getTimersFromSharedPrefs(prefs, timers);
+            if (timers.isEmpty()) {
+                final String reason = mContext.getString(R.string.no_timer_set);
+                LogUtils.i(reason);
+                Voice.notifyFailure(mActivity, reason);
+                return null;
+            }
+            switch (mAction) {
+                case ACTION_DELETE_TIMER: {
+                    // Delete a timer only if there's one available
+                    if (timers.size() != 1) {
+                        return null;
+                    }
+                    final TimerObj timer = timers.get(0);
+                    timer.deleteFromSharedPref(prefs);
+                    Events.sendTimerEvent(R.string.action_delete, R.string.label_intent);
+                    final String reason = mContext.getString(R.string.timer_deleted);
+                    Voice.notifySuccess(mActivity, reason);
+                    LogUtils.i(reason);
+                    break;
+                }
+                case ACTION_START_TIMER: {
+                    final TimerObj timer = getTimerWithStateToIgnore(timers, TimerObj.STATE_RUNNING);
+                    // Only start a timer if there's one non-running timer available
+                    if (timer == null) {
+                        // notifyFailure was already triggered
+                        return null;
+                    }
+                    timer.setState(TimerObj.STATE_RUNNING);
+                    timer.mStartTime = Utils.getTimeNow() - (timer.mSetupLength - timer.mTimeLeft);
+                    timer.writeToSharedPref(prefs);
+                    final String reason = mContext.getString(R.string.timer_started);
+                    Voice.notifySuccess(mActivity, reason);
+                    LogUtils.i(reason);
+                    Events.sendTimerEvent(R.string.action_start, R.string.label_intent);
+                    break;
+                }
+                case ACTION_RESET_TIMER: {
+                    // Since timer can be reset only if it's stopped
+                    // it's only triggered when there's only one stopped timer
+                    final Set<Integer> statesToInclude = new HashSet<>();
+                    statesToInclude.add(TimerObj.STATE_STOPPED);
+                    final TimerObj timer = getTimerWithStatesToInclude(timers, statesToInclude);
+                    if (timer == null) {
+                        // all timers are running
+                        final String reason = mContext.getString(
+                                R.string.timer_cant_be_reset_because_its_running);
+                        LogUtils.i(reason);
+                        Voice.notifyFailure(mActivity, reason);
+                        return null;
+                    }
+                    final String reason = mContext.getString(R.string.timer_was_reset);
+                    Voice.notifySuccess(mActivity, reason);
+                    LogUtils.i(reason);
+                    timer.setState(TimerObj.STATE_RESTART);
+                    timer.mTimeLeft = timer.mOriginalLength;
+                    timer.writeToSharedPref(prefs);
+                    Events.sendTimerEvent(R.string.action_reset, R.string.label_intent);
+                    break;
+                }
+                case ACTION_STOP_TIMER: {
+                    final Set<Integer> statesToInclude = new HashSet<>();
+                    statesToInclude.add(TimerObj.STATE_TIMESUP);
+                    statesToInclude.add(TimerObj.STATE_RUNNING);
+                    // Timer is stopped if there's only one running timer
+                    final TimerObj timer = getTimerWithStatesToInclude(timers, statesToInclude);
+                    if (timer == null) {
+                        // no running timers
+                        final String reason = mContext.getString(R.string.timer_already_stopped);
+                        LogUtils.i(reason);
+                        Voice.notifyFailure(mActivity, reason);
+                        return null;
+                    }
+                    final String reason = mContext.getString(R.string.timer_stopped);
+                    LogUtils.i(reason);
+                    Voice.notifySuccess(mActivity, reason);
+                    timer.setState(TimerObj.STATE_STOPPED);
+                    timer.writeToSharedPref(prefs);
+                    Events.sendTimerEvent(R.string.action_stop, R.string.label_intent);
+                    break;
+                }
+            }
+            return null;
+        }
+
+        /**
+         * @param timers available to the user
+         * @param stateToIgnore the opposite of the state that the timer should be in
+         * @return a timer only if there's one timer available that is of a state
+         * other than the state that's passed
+         * in all other cases returns null
+         */
+        private TimerObj getTimerWithStateToIgnore(List<TimerObj> timers, int stateToIgnore) {
+            TimerObj soleTimer = null;
+            for (TimerObj timer : timers) {
+                if (timer.mState != stateToIgnore) {
+                    if (soleTimer == null) {
+                        soleTimer = timer;
+                    } else {
+                        // soleTimer has already been set
+                        final String reason = mContext.getString(R.string.multiple_timers_available);
+                        LogUtils.i(reason);
+                        Voice.notifyFailure(mActivity, reason);
+                        return null;
+                    }
+                }
+            }
+            return soleTimer;
+        }
+
+        /**
+         * @param timers available to the user
+         * @param statesToInclude acceptable states of the timer
+         * @return a timer only if there's one timer available that is of the state
+         * that is passed in
+         * in all other cases returns null
+         */
+        private TimerObj getTimerWithStatesToInclude(
+                List<TimerObj> timers, Set<Integer> statesToInclude) {
+            TimerObj soleTimer = null;
+            for (TimerObj timer : timers) {
+                if (statesToInclude.contains(timer.mState)) {
+                    if (soleTimer == null) {
+                        soleTimer = timer;
+                    } else {
+                        // soleTimer has already been set
+                        final String reason = mContext.getString(
+                                R.string.multiple_timers_available);
+                        LogUtils.i(reason);
+                        Voice.notifyFailure(mActivity, reason);
+                        return null;
+                    }
+                }
+            }
+            return soleTimer;
+        }
+    }
+
+    private static class HandleClockAsync extends AsyncTask<Void, Void, Void> {
+        private final Context mContext;
+        private final Intent mIntent;
+        private final Activity mActivity;
+
+        public HandleClockAsync(Context context, Intent intent, Activity activity) {
+            mContext = context;
+            mIntent = intent;
+            mActivity = activity;
+        }
+
+        @Override
+        protected Void doInBackground(Void... parameters) {
+            final String cityExtra = mIntent.getStringExtra(EXTRA_CITY);
+            final SharedPreferences prefs =
+                    PreferenceManager.getDefaultSharedPreferences(mContext);
+            switch (mIntent.getAction()) {
+                case ACTION_ADD_CLOCK: {
+                    // if a city isn't specified open CitiesActivity to choose a city
+                    if (cityExtra == null) {
+                        final String reason = mContext.getString(R.string.no_city_selected);
+                        Voice.notifyFailure(mActivity, reason);
+                        LogUtils.i(reason);
+                        mContext.startActivity(new Intent(mContext, CitiesActivity.class));
+                        Events.sendClockEvent(R.string.action_create, R.string.label_intent);
+                        break;
+                    }
+
+                    // if a city is passed add that city to the list
+                    final Map<String, CityObj> cities = Utils.loadCityMapFromXml(mContext);
+                    final CityObj city = cities.get(cityExtra.toLowerCase());
+                    // check if this city exists in the list of available cities
+                    if (city == null) {
+                        final String reason = mContext.getString(
+                                R.string.the_city_you_specified_is_not_available);
+                        Voice.notifyFailure(mActivity, reason);
+                        LogUtils.i(reason);
+                        break;
+                    }
+
+                    final HashMap<String, CityObj> selectedCities =
+                            Cities.readCitiesFromSharedPrefs(prefs);
+                    // if this city is already added don't add it
+                    if (selectedCities.put(city.mCityId, city) != null) {
+                        final String reason = mContext.getString(R.string.the_city_already_added);
+                        Voice.notifyFailure(mActivity, reason);
+                        LogUtils.i(reason);
+                        break;
+                    }
+
+                    Cities.saveCitiesToSharedPrefs(prefs, selectedCities);
+                    final String reason = mContext.getString(R.string.city_added, city.mCityName);
+                    Voice.notifySuccess(mActivity, reason);
+                    LogUtils.i(reason);
+                    Events.sendClockEvent(R.string.action_start, R.string.label_intent);
+                    break;
+                }
+                case ACTION_DELETE_CLOCK: {
+                    if (cityExtra == null) {
+                        // if a city isn't specified open CitiesActivity to choose a city
+                        final String reason = mContext.getString(R.string.no_city_selected);
+                        Voice.notifyFailure(mActivity, reason);
+                        LogUtils.i(reason);
+                        mContext.startActivity(new Intent(mContext, CitiesActivity.class));
+                        Events.sendClockEvent(R.string.action_create, R.string.label_intent);
+                        break;
+                    }
+
+                    // if a city is specified check if it's selected and if so delete it
+                    final Map<String, CityObj> cities = Utils.loadCityMapFromXml(mContext);
+                    // check if this city exists in the list of available cities
+                    final CityObj city = cities.get(cityExtra.toLowerCase());
+                    if (city == null) {
+                        final String reason = mContext.getString(
+                                R.string.the_city_you_specified_is_not_available);
+                        Voice.notifyFailure(mActivity, reason);
+                        LogUtils.i(reason);
+                        break;
+                    }
+
+                    final HashMap<String, CityObj> selectedCities =
+                            Cities.readCitiesFromSharedPrefs(prefs);
+                    if (selectedCities.remove(city.mCityId) != null) {
+                        final String reason = mContext.getString(R.string.city_deleted,
+                                city.mCityName);
+                        Voice.notifySuccess(mActivity, reason);
+                        LogUtils.i(reason);
+                        Cities.saveCitiesToSharedPrefs(prefs, selectedCities);
+                        Events.sendClockEvent(R.string.action_delete, R.string.label_intent);
+                    } else {
+                        // the specified city hasn't been added to the user's list yet
+                        Voice.notifyFailure(mActivity, mContext.getString(
+                                R.string.the_city_you_specified_is_not_available));
+                    }
+                    break;
+                }
+                case ACTION_SHOW_CLOCK:
+                    Events.sendClockEvent(R.string.action_show, R.string.label_intent);
+                    break;
+            }
+            return null;
+        }
+    }
+}
diff --git a/src/com/android/deskclock/LabelDialogFragment.java b/src/com/android/deskclock/LabelDialogFragment.java
index 9d61eb4..472e378 100644
--- a/src/com/android/deskclock/LabelDialogFragment.java
+++ b/src/com/android/deskclock/LabelDialogFragment.java
@@ -17,21 +17,20 @@
 package com.android.deskclock;
 
 import android.app.Activity;
+import android.app.Dialog;
 import android.app.DialogFragment;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.AppCompatEditText;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
-import android.widget.EditText;
 import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
 
 import com.android.deskclock.provider.Alarm;
 import com.android.deskclock.timer.TimerObj;
@@ -46,7 +45,7 @@
     private static final String KEY_TIMER = "timer";
     private static final String KEY_TAG = "tag";
 
-    private EditText mLabelBox;
+    private AppCompatEditText mLabelBox;
 
     public static LabelDialogFragment newInstance(Alarm alarm, String label, String tag) {
         final LabelDialogFragment frag = new LabelDialogFragment();
@@ -71,23 +70,21 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setStyle(DialogFragment.STYLE_NO_TITLE, 0);
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
         Bundle bundle = getArguments();
         final String label = bundle.getString(KEY_LABEL);
         final Alarm alarm = bundle.getParcelable(KEY_ALARM);
         final TimerObj timer = bundle.getParcelable(KEY_TIMER);
         final String tag = bundle.getString(KEY_TAG);
 
-        final View view = inflater.inflate(R.layout.label_dialog, container, false);
+        final Context context = getActivity();
 
-        mLabelBox = (EditText) view.findViewById(R.id.labelBox);
+        mLabelBox = new AppCompatEditText(context);
         mLabelBox.setText(label);
-        mLabelBox.setOnEditorActionListener(new OnEditorActionListener() {
+        mLabelBox.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
                 if (actionId == EditorInfo.IME_ACTION_DONE) {
@@ -111,28 +108,30 @@
             public void afterTextChanged(Editable editable) {
             }
         });
+        mLabelBox.selectAll();
         setLabelBoxBackground(TextUtils.isEmpty(label));
 
-        final Button cancelButton = (Button) view.findViewById(R.id.cancelButton);
-        cancelButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                dismiss();
-            }
-        });
+        final AlertDialog alertDialog = new AlertDialog.Builder(context)
+                .setView(mLabelBox)
+                .setPositiveButton(R.string.time_picker_set, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        set(alarm, timer, tag);
+                    }
+                })
+                .setNegativeButton(R.string.time_picker_cancel,
+                        new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            dismiss();
+                        }
+                })
+                .setMessage(R.string.label)
+                .create();
 
-        final Button setButton = (Button) view.findViewById(R.id.setButton);
-        setButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                set(alarm, timer, tag);
-            }
-        });
-
-        getDialog().getWindow().setSoftInputMode(
+        alertDialog.getWindow().setSoftInputMode(
                 WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-
-        return view;
+        return alertDialog;
     }
 
     private void set(Alarm alarm, TimerObj timer, String tag) {
@@ -155,7 +154,7 @@
         final Activity activity = getActivity();
         // TODO just pass in a listener in newInstance()
         if (activity instanceof AlarmLabelDialogHandler) {
-            ((DeskClock) getActivity()).onDialogLabelSet(alarm, label, tag);
+            ((DeskClock) activity).onDialogLabelSet(alarm, label, tag);
         } else {
             LogUtils.e("Error! Activities that use LabelDialogFragment must implement "
                     + "AlarmLabelDialogHandler");
@@ -167,7 +166,7 @@
         final Activity activity = getActivity();
         // TODO just pass in a listener in newInstance()
         if (activity instanceof TimerLabelDialogHandler){
-            ((DeskClock) getActivity()).onDialogLabelSet(timer, label, tag);
+            ((DeskClock) activity).onDialogLabelSet(timer, label, tag);
         } else {
             LogUtils.e("Error! Activities that use LabelDialogFragment must implement "
                     + "AlarmLabelDialogHandler or TimerLabelDialogHandler");
diff --git a/src/com/android/deskclock/NumberPickerCompat.java b/src/com/android/deskclock/NumberPickerCompat.java
new file mode 100644
index 0000000..43018d6
--- /dev/null
+++ b/src/com/android/deskclock/NumberPickerCompat.java
@@ -0,0 +1,69 @@
+package com.android.deskclock;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.widget.NumberPicker;
+
+import java.lang.reflect.Field;
+
+/**
+ * Subclass of NumberPicker that allows customizing divider color.
+ */
+public class NumberPickerCompat extends NumberPicker {
+
+    private static Field sSelectionDivider;
+    private static boolean sTrySelectionDivider = true;
+
+    public NumberPickerCompat(Context context) {
+        this(context, null /* attrs */);
+    }
+
+    public NumberPickerCompat(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        tintSelectionDivider(context);
+    }
+
+    public NumberPickerCompat(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        tintSelectionDivider(context);
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    private void tintSelectionDivider(Context context) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP
+                || Build.VERSION.SDK_INT > Build.VERSION_CODES.MNC) {
+            // Accent color in KK will stay system blue, so leave divider color matching.
+            // The divider is correctly tinted to controlColorNormal in MNC.
+            return;
+        }
+
+        if (sTrySelectionDivider) {
+            final TypedArray a = context.obtainStyledAttributes(
+                    new int[] { android.R.attr.colorControlNormal });
+             // White is default color if colorControlNormal is not defined.
+            final int color = a.getColor(0, Color.WHITE);
+            a.recycle();
+
+            try {
+                if (sSelectionDivider == null) {
+                    sSelectionDivider = NumberPicker.class.getDeclaredField("mSelectionDivider");
+                    sSelectionDivider.setAccessible(true);
+                }
+                final Drawable selectionDivider = (Drawable) sSelectionDivider.get(this);
+                if (selectionDivider != null) {
+                    // setTint is API21+, but this will only be called in API21
+                    selectionDivider.setTint(color);
+                }
+            } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+                LogUtils.e("Unable to set selection divider", e);
+                sTrySelectionDivider = false;
+            }
+        }
+    }
+
+}
diff --git a/src/com/android/deskclock/ScreensaverActivity.java b/src/com/android/deskclock/ScreensaverActivity.java
index c145e89..573ce79 100644
--- a/src/com/android/deskclock/ScreensaverActivity.java
+++ b/src/com/android/deskclock/ScreensaverActivity.java
@@ -155,7 +155,6 @@
     public void onPause() {
         mHandler.removeCallbacks(mMoveSaverRunnable);
         Utils.cancelMidnightUpdater(mHandler, mMidnightUpdater);
-        finish();
         super.onPause();
     }
 
diff --git a/src/com/android/deskclock/SettingsActivity.java b/src/com/android/deskclock/SettingsActivity.java
index 9b121f8..248bb6f 100644
--- a/src/com/android/deskclock/SettingsActivity.java
+++ b/src/com/android/deskclock/SettingsActivity.java
@@ -16,6 +16,8 @@
 
 package com.android.deskclock;
 
+import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.media.AudioManager;
@@ -41,6 +43,7 @@
 public class SettingsActivity extends BaseActivity {
 
     public static final String KEY_ALARM_SNOOZE = "snooze_duration";
+    public static final String KEY_ALARM_VOLUME = "volume_setting";
     public static final String KEY_VOLUME_BEHAVIOR = "volume_button_setting";
     public static final String KEY_AUTO_SILENCE = "auto_silence";
     public static final String KEY_CLOCK_STYLE = "clock_style";
@@ -84,7 +87,7 @@
 
 
     public static class PrefsFragment extends PreferenceFragment
-            implements Preference.OnPreferenceChangeListener {
+            implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener {
 
         private static CharSequence[][] mTimezones;
         private long mTime;
@@ -149,6 +152,23 @@
             return true;
         }
 
+        @Override
+        public boolean onPreferenceClick(Preference pref) {
+            final Activity activity = getActivity();
+            if (activity == null) {
+                return false;
+            }
+
+            if (KEY_ALARM_VOLUME.equals(pref.getKey())) {
+                final AudioManager audioManager =
+                        (AudioManager) activity.getSystemService(Context.AUDIO_SERVICE);
+                audioManager.adjustStreamVolume(AudioManager.STREAM_ALARM,
+                        AudioManager.ADJUST_SAME, AudioManager.FLAG_SHOW_UI);
+                return true;
+            }
+            return false;
+        }
+
         /**
          * Returns an array of ids/time zones. This returns a double indexed array
          * of ids and time zones for Calendar. It is an inefficient method and
@@ -207,6 +227,9 @@
             volumeButtonsPref.setSummary(volumeButtonsPref.getEntry());
             volumeButtonsPref.setOnPreferenceChangeListener(this);
 
+            final Preference volumePref = findPreference(KEY_ALARM_VOLUME);
+            volumePref.setOnPreferenceClickListener(this);
+
             final SnoozeLengthDialog snoozePref =
                     (SnoozeLengthDialog) findPreference(KEY_ALARM_SNOOZE);
             snoozePref.setSummary();
@@ -226,7 +249,8 @@
             if (i == -1) {
                 listPref.setSummary(R.string.auto_silence_never);
             } else {
-                listPref.setSummary(getString(R.string.auto_silence_summary, i));
+                listPref.setSummary(Utils.getNumberFormattedQuantityString(getActivity(),
+                        R.plurals.auto_silence_summary, i));
             }
         }
 
diff --git a/src/com/android/deskclock/SnoozeLengthDialog.java b/src/com/android/deskclock/SnoozeLengthDialog.java
index 8fd564f..3ba7590 100644
--- a/src/com/android/deskclock/SnoozeLengthDialog.java
+++ b/src/com/android/deskclock/SnoozeLengthDialog.java
@@ -2,7 +2,6 @@
 
 import android.app.AlertDialog;
 import android.content.Context;
-import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.preference.DialogPreference;
 import android.util.AttributeSet;
@@ -91,9 +90,8 @@
     }
 
     public void setSummary() {
-        setSummary(String.format(mContext.getResources()
-                .getQuantityText(R.plurals.snooze_duration, mSnoozeMinutes).toString(),
-                mSnoozeMinutes));
+        setSummary(Utils.getNumberFormattedQuantityString(mContext, R.plurals.snooze_duration,
+                        mSnoozeMinutes));
     }
 
     public int getCurrentValue() {
diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java
index a0e5e32..32416f2 100644
--- a/src/com/android/deskclock/Utils.java
+++ b/src/com/android/deskclock/Utils.java
@@ -55,16 +55,20 @@
 import android.widget.TextClock;
 import android.widget.TextView;
 
+import com.android.deskclock.provider.AlarmInstance;
 import com.android.deskclock.provider.DaysOfWeek;
 import com.android.deskclock.stopwatch.Stopwatches;
 import com.android.deskclock.timer.Timers;
 import com.android.deskclock.worldclock.CityObj;
 
+import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 import java.util.TimeZone;
 
 
@@ -518,6 +522,12 @@
         return timeString;
     }
 
+    public static boolean isAlarmWithin24Hours(AlarmInstance alarmInstance) {
+        final Calendar nextAlarmTime = alarmInstance.getAlarmTime();
+        final long nextAlarmTimeMillis = nextAlarmTime.getTimeInMillis();
+        return nextAlarmTimeMillis - System.currentTimeMillis() <= DateUtils.DAY_IN_MILLIS;
+    }
+
     /** Clock views can call this to refresh their alarm to the next upcoming value. **/
     public static void refreshAlarm(Context context, View clock) {
         final String nextAlarm = getNextAlarm(context);
@@ -550,8 +560,8 @@
             dateDisplay.setVisibility(View.VISIBLE);
             dateDisplay.setContentDescription(isJBMR2OrLater()
                     ? new SimpleDateFormat(
-                            DateFormat.getBestDateTimePattern(l, dateFormatForAccessibility), l)
-                            .format(now)
+                    DateFormat.getBestDateTimePattern(l, dateFormatForAccessibility), l)
+                    .format(now)
                     : SimpleDateFormat.getDateInstance(java.text.DateFormat.FULL).format(now));
         }
     }
@@ -612,19 +622,29 @@
         Resources r = c.getResources();
         // Read strings array of name,timezone, id
         // make sure the list are the same length
-        String[] cities = r.getStringArray(R.array.cities_names);
+        String[] cityNames = r.getStringArray(R.array.cities_names);
         String[] timezones = r.getStringArray(R.array.cities_tz);
         String[] ids = r.getStringArray(R.array.cities_id);
-        int minLength = cities.length;
-        if (cities.length != timezones.length || ids.length != cities.length) {
-            minLength = Math.min(cities.length, Math.min(timezones.length, ids.length));
+        int minLength = cityNames.length;
+        if (cityNames.length != timezones.length || ids.length != cityNames.length) {
+            minLength = Math.min(cityNames.length, Math.min(timezones.length, ids.length));
             LogUtils.e("City lists sizes are not the same, truncating");
         }
-        CityObj[] tempList = new CityObj[minLength];
+        CityObj[] cities = new CityObj[minLength];
         for (int i = 0; i < cities.length; i++) {
-            tempList[i] = new CityObj(cities[i], timezones[i], ids[i]);
+            cities[i] = new CityObj(cityNames[i], timezones[i], ids[i]);
         }
-        return tempList;
+        return cities;
+    }
+    // Returns a map of cities where the key is lowercase
+    public static Map<String, CityObj> loadCityMapFromXml(Context c) {
+        CityObj[] cities = loadCitiesFromXml(c);
+
+        final Map<String, CityObj> map = new HashMap<>(cities.length);
+        for (CityObj city : cities) {
+            map.put(city.mCityName.toLowerCase(), city);
+        }
+        return map;
     }
 
     /**
@@ -739,4 +759,15 @@
         // Track the Locale used to generate these weekdays
         sLocaleUsedForWeekdays = Locale.getDefault();
     }
+
+    /**
+     * @param context
+     * @param id Resource id of the plural
+     * @param quantity integer value
+     * @return string with properly localized numbers
+     */
+    public static String getNumberFormattedQuantityString(Context context, int id, int quantity) {
+        final String localizedQuantity = NumberFormat.getInstance().format(quantity);
+        return context.getResources().getQuantityString(id, quantity, localizedQuantity);
+    }
 }
diff --git a/src/com/android/deskclock/Voice.java b/src/com/android/deskclock/Voice.java
new file mode 100644
index 0000000..665442f
--- /dev/null
+++ b/src/com/android/deskclock/Voice.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.deskclock;
+
+import android.app.Activity;
+import android.app.VoiceInteractor;
+import android.os.Build;
+
+/**
+ * Notifies Voice Interactor about whether the action
+ * was successful. Voice Interactor is called only if
+ * the build version is post-Lollipop.
+ */
+public final class Voice {
+
+    private static Delegate sDelegate = new VoiceInteractorDelegate();
+
+    private Voice() { }
+
+    public static void setDelegate(Delegate delegate) {
+        sDelegate = delegate;
+    }
+
+    public static void notifySuccess(Activity activity, String message) {
+        // TODO change this to Build.VERSION.SDK_INT > Build.VERSION.LOLLIPOP_MR1
+        if (Build.VERSION.CODENAME.equals("MNC")) {
+            sDelegate.notifySuccess(activity.getVoiceInteractor(), message);
+        }
+    }
+
+    public static void notifyFailure(Activity activity, String message) {
+        // TODO change this to Build.VERSION.SDK_INT > Build.VERSION.LOLLIPOP_MR1
+        if (Build.VERSION.CODENAME.equals("MNC")) {
+            sDelegate.notifyFailure(activity.getVoiceInteractor(), message);
+        }
+    }
+
+    public interface Delegate {
+        void notifySuccess(VoiceInteractor vi, String message);
+
+        void notifyFailure(VoiceInteractor vi, String message);
+    }
+
+    private static class VoiceInteractorDelegate implements Delegate {
+        @Override
+        public void notifySuccess(VoiceInteractor vi, String message) {
+            if (vi != null)  {
+                final VoiceInteractor.Prompt prompt = new VoiceInteractor.Prompt(message);
+                vi.submitRequest(new VoiceInteractor.CompleteVoiceRequest(prompt, null));
+            }
+        }
+
+        @Override
+        public void notifyFailure(VoiceInteractor vi, String message) {
+            if (vi != null)  {
+                final VoiceInteractor.Prompt prompt = new VoiceInteractor.Prompt(message);
+                vi.submitRequest(new VoiceInteractor.AbortVoiceRequest(prompt, null));
+            }
+        }
+    }
+}
diff --git a/src/com/android/deskclock/alarms/AlarmKlaxon.java b/src/com/android/deskclock/alarms/AlarmKlaxon.java
index dbbf0e6..e5401ab 100644
--- a/src/com/android/deskclock/alarms/AlarmKlaxon.java
+++ b/src/com/android/deskclock/alarms/AlarmKlaxon.java
@@ -102,7 +102,7 @@
                 }
                 startAlarm(context, sMediaPlayer);
             } catch (Exception ex) {
-                LogUtils.v("Using the fallback ringtone");
+                LogUtils.e("Use the fallback ringtone, original was " + alarmNoise, ex);
                 // The alarmNoise may be on the sd card which could be busy right
                 // now. Use the fallback ringtone.
                 try {
diff --git a/src/com/android/deskclock/alarms/AlarmNotifications.java b/src/com/android/deskclock/alarms/AlarmNotifications.java
index d4bf271..995af1d 100644
--- a/src/com/android/deskclock/alarms/AlarmNotifications.java
+++ b/src/com/android/deskclock/alarms/AlarmNotifications.java
@@ -31,6 +31,8 @@
 import com.android.deskclock.provider.AlarmInstance;
 
 public final class AlarmNotifications {
+    public static final String EXTRA_NOTIFICATION_ID = "extra_notification_id";
+
     public static void showLowPriorityNotification(Context context, AlarmInstance instance) {
         LogUtils.v("Displaying low priority notification for alarm instance: " + instance.mId);
         NotificationManagerCompat nm = NotificationManagerCompat.from(context);
@@ -55,7 +57,7 @@
 
         // Setup up dismiss action
         Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context,
-                AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.DISMISSED_STATE);
+                AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.PREDISMISSED_STATE);
         notification.addAction(R.drawable.ic_alarm_off_24dp,
                 context.getString(R.string.alarm_alert_dismiss_now_text),
                 PendingIntent.getBroadcast(context, instance.hashCode(),
@@ -89,7 +91,7 @@
 
         // Setup up dismiss action
         Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context,
-                AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.DISMISSED_STATE);
+                AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.PREDISMISSED_STATE);
         notification.addAction(R.drawable.ic_alarm_off_24dp,
                 context.getString(R.string.alarm_alert_dismiss_now_text),
                 PendingIntent.getBroadcast(context, instance.hashCode(),
@@ -152,21 +154,24 @@
                 .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                 .setLocalOnly(true);
 
+        final int hashCode = instance.hashCode();
+
         // Setup dismiss intent
         Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context,
                 AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.DISMISSED_STATE);
-        notification.setDeleteIntent(PendingIntent.getBroadcast(context, instance.hashCode(),
+        notification.setDeleteIntent(PendingIntent.getBroadcast(context, hashCode,
                 dismissIntent, PendingIntent.FLAG_UPDATE_CURRENT));
 
         // Setup content intent
         Intent showAndDismiss = AlarmInstance.createIntent(context, AlarmStateManager.class,
                 instance.mId);
+        showAndDismiss.putExtra(EXTRA_NOTIFICATION_ID, hashCode);
         showAndDismiss.setAction(AlarmStateManager.SHOW_AND_DISMISS_ALARM_ACTION);
-        notification.setContentIntent(PendingIntent.getBroadcast(context, instance.hashCode(),
+        notification.setContentIntent(PendingIntent.getBroadcast(context, hashCode,
                 showAndDismiss, PendingIntent.FLAG_UPDATE_CURRENT));
 
-        nm.cancel(instance.hashCode());
-        nm.notify(instance.hashCode(), notification.build());
+        nm.cancel(hashCode);
+        nm.notify(hashCode, notification.build());
     }
 
     public static void showAlarmNotification(Context context, AlarmInstance instance) {
diff --git a/src/com/android/deskclock/alarms/AlarmService.java b/src/com/android/deskclock/alarms/AlarmService.java
index 5f1cdd2..16018b7 100644
--- a/src/com/android/deskclock/alarms/AlarmService.java
+++ b/src/com/android/deskclock/alarms/AlarmService.java
@@ -41,7 +41,7 @@
  */
 public class AlarmService extends Service {
     /**
-     * AlarmActivity and AlarmService (when unbound0 listen for this broadcast intent
+     * AlarmActivity and AlarmService (when unbound) listen for this broadcast intent
      * so that other applications can snooze the alarm (after ALARM_ALERT_ACTION and before
      * ALARM_DONE_ACTION).
      */
@@ -94,8 +94,8 @@
      * @param instance to trigger alarm
      */
     public static void startAlarm(Context context, AlarmInstance instance) {
-        Intent intent = AlarmInstance.createIntent(context, AlarmService.class, instance.mId);
-        intent.setAction(START_ALARM_ACTION);
+        final Intent intent = AlarmInstance.createIntent(context, AlarmService.class, instance.mId)
+                .setAction(START_ALARM_ACTION);
 
         // Maintain a cpu wake lock until the service can get it
         AlarmAlertWakeLock.acquireCpuWakeLock(context);
@@ -110,8 +110,8 @@
      * @param instance you are trying to stop
      */
     public static void stopAlarm(Context context, AlarmInstance instance) {
-        Intent intent = AlarmInstance.createIntent(context, AlarmService.class, instance.mId);
-        intent.setAction(STOP_ALARM_ACTION);
+        final Intent intent = AlarmInstance.createIntent(context, AlarmService.class, instance.mId)
+                .setAction(STOP_ALARM_ACTION);
 
         // We don't need a wake lock here, since we are trying to kill an alarm
         context.startService(intent);
@@ -150,7 +150,7 @@
         AlarmNotifications.showAlarmNotification(this, mCurrentAlarm);
         mInitialCallState = mTelephonyManager.getCallState();
         mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
-        boolean inCall = mInitialCallState != TelephonyManager.CALL_STATE_IDLE;
+        final boolean inCall = mInitialCallState != TelephonyManager.CALL_STATE_IDLE;
         AlarmKlaxon.start(this, mCurrentAlarm, inCall);
         sendBroadcast(new Intent(ALARM_ALERT_ACTION));
     }
@@ -173,31 +173,31 @@
     private final BroadcastReceiver mActionsReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-        final String action = intent.getAction();
-        LogUtils.i("AlarmService received intent %s", action);
-        if (mCurrentAlarm == null || mCurrentAlarm.mAlarmState != AlarmInstance.FIRED_STATE) {
-            LogUtils.i("No valid firing alarm");
-            return;
-        }
-        if (mIsBound) {
-            LogUtils.i("AlarmActivity bound; AlarmService no-op");
-            return;
-        }
-        switch (action) {
-            case ALARM_SNOOZE_ACTION:
-                // Set the alarm state to snoozed.
-                // If this broadcast receiver is handling the snooze intent then AlarmActivity
-                // must not be showing, so always show snooze toast.
-                AlarmStateManager.setSnoozeState(context, mCurrentAlarm, true /* showToast */);
-                Events.sendAlarmEvent(R.string.action_snooze, R.string.label_intent);
-                break;
-            case ALARM_DISMISS_ACTION:
-                // Set the alarm state to dismissed.
-                AlarmStateManager.setDismissState(context, mCurrentAlarm);
-                Events.sendAlarmEvent(R.string.action_dismiss, R.string.label_intent);
-                break;
-            default:
-                break;
+            final String action = intent.getAction();
+            LogUtils.i("AlarmService received intent %s", action);
+            if (mCurrentAlarm == null || mCurrentAlarm.mAlarmState != AlarmInstance.FIRED_STATE) {
+                LogUtils.i("No valid firing alarm");
+                return;
+            }
+
+            if (mIsBound) {
+                LogUtils.i("AlarmActivity bound; AlarmService no-op");
+                return;
+            }
+
+            switch (action) {
+                case ALARM_SNOOZE_ACTION:
+                    // Set the alarm state to snoozed.
+                    // If this broadcast receiver is handling the snooze intent then AlarmActivity
+                    // must not be showing, so always show snooze toast.
+                    AlarmStateManager.setSnoozeState(context, mCurrentAlarm, true /* showToast */);
+                    Events.sendAlarmEvent(R.string.action_snooze, R.string.label_intent);
+                    break;
+                case ALARM_DISMISS_ACTION:
+                    // Set the alarm state to dismissed.
+                    AlarmStateManager.setDismissState(context, mCurrentAlarm);
+                    Events.sendAlarmEvent(R.string.action_dismiss, R.string.label_intent);
+                    break;
             }
         }
     };
@@ -218,30 +218,34 @@
     public int onStartCommand(Intent intent, int flags, int startId) {
         LogUtils.v("AlarmService.onStartCommand() with intent: %s", intent.toString());
 
-        long instanceId = AlarmInstance.getId(intent.getData());
-        if (START_ALARM_ACTION.equals(intent.getAction())) {
-            ContentResolver cr = this.getContentResolver();
-            AlarmInstance instance = AlarmInstance.getInstance(cr, instanceId);
-            if (instance == null) {
-                LogUtils.e("No instance found to start alarm: %d", instanceId);
-                if (mCurrentAlarm != null) {
-                    // Only release lock if we are not firing alarm
-                    AlarmAlertWakeLock.releaseCpuLock();
+        final long instanceId = AlarmInstance.getId(intent.getData());
+        switch (intent.getAction()) {
+            case START_ALARM_ACTION:
+                final ContentResolver cr = this.getContentResolver();
+                final AlarmInstance instance = AlarmInstance.getInstance(cr, instanceId);
+                if (instance == null) {
+                    LogUtils.e("No instance found to start alarm: %d", instanceId);
+                    if (mCurrentAlarm != null) {
+                        // Only release lock if we are not firing alarm
+                        AlarmAlertWakeLock.releaseCpuLock();
+                    }
+                    break;
                 }
-                return Service.START_NOT_STICKY;
-            } else if (mCurrentAlarm != null && mCurrentAlarm.mId == instanceId) {
-                LogUtils.e("Alarm already started for instance: %d", instanceId);
-                return Service.START_NOT_STICKY;
-            }
-            startAlarm(instance);
-        } else if(STOP_ALARM_ACTION.equals(intent.getAction())) {
-            if (mCurrentAlarm != null && mCurrentAlarm.mId != instanceId) {
-                LogUtils.e("Can't stop alarm for instance: %d because current alarm is: %d",
-                        instanceId, mCurrentAlarm.mId);
-                return Service.START_NOT_STICKY;
-            }
-            stopCurrentAlarm();
-            stopSelf();
+
+                if (mCurrentAlarm != null && mCurrentAlarm.mId == instanceId) {
+                    LogUtils.e("Alarm already started for instance: %d", instanceId);
+                    break;
+                }
+                startAlarm(instance);
+                break;
+            case STOP_ALARM_ACTION:
+                if (mCurrentAlarm != null && mCurrentAlarm.mId != instanceId) {
+                    LogUtils.e("Can't stop alarm for instance: %d because current alarm is: %d",
+                            instanceId, mCurrentAlarm.mId);
+                    break;
+                }
+                stopCurrentAlarm();
+                stopSelf();
         }
 
         return Service.START_NOT_STICKY;
@@ -251,7 +255,9 @@
     public void onDestroy() {
         LogUtils.v("AlarmService.onDestroy() called");
         super.onDestroy();
-        stopCurrentAlarm();
+        if (mCurrentAlarm != null) {
+            stopCurrentAlarm();
+        }
 
         if (mIsRegistered) {
             unregisterReceiver(mActionsReceiver);
diff --git a/src/com/android/deskclock/alarms/AlarmStateManager.java b/src/com/android/deskclock/alarms/AlarmStateManager.java
index 161fd8b..99d00f4 100644
--- a/src/com/android/deskclock/alarms/AlarmStateManager.java
+++ b/src/com/android/deskclock/alarms/AlarmStateManager.java
@@ -25,9 +25,12 @@
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Handler;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
+import android.text.format.DateFormat;
+import android.support.v4.app.NotificationManagerCompat;
 import android.widget.Toast;
 
 import com.android.deskclock.AlarmAlertWakeLock;
@@ -63,7 +66,7 @@
  *
  * LOW_NOTIFICATION_STATE:
  * This state is used to notify the user that the alarm will go off
- * {@link AlarmInstance.LOW_NOTIFICATION_HOUR_OFFSET}. This
+ * {@link AlarmInstance#LOW_NOTIFICATION_HOUR_OFFSET}. This
  * state handles the state changes to HIGH_NOTIFICATION_STATE, HIDE_NOTIFICATION_STATE and
  * DISMISS_STATE.
  *
@@ -89,7 +92,7 @@
  * it. At this point the alarm instance is dead and we check the parent alarm to see if we need
  * to disable or schedule a new alarm_instance. There is also a notification shown to the user
  * that he/she missed the alarm and that stays for
- * {@link AlarmInstance.MISSED_TIME_TO_LIVE_HOUR_OFFSET} or until the user acknownledges it.
+ * {@link AlarmInstance#MISSED_TIME_TO_LIVE_HOUR_OFFSET} or until the user acknownledges it.
  *
  * DISMISS_STATE:
  * This is really a transient state that will properly delete the alarm instance. Use this state,
@@ -132,6 +135,28 @@
     // Buffer time in seconds to fire alarm instead of marking it missed.
     public static final int ALARM_FIRE_BUFFER = 15;
 
+    // A factory for the current time; can be mocked for testing purposes.
+    private static CurrentTimeFactory sCurrentTimeFactory;
+
+    // Schedules alarm state transitions; can be mocked for testing purposes.
+    private static StateChangeScheduler sStateChangeScheduler =
+            new AlarmManagerStateChangeScheduler();
+
+    private static Calendar getCurrentTime() {
+        return sCurrentTimeFactory == null ?
+                Calendar.getInstance() : sCurrentTimeFactory.getCurrentTime();
+    }
+    static void setCurrentTimeFactory(CurrentTimeFactory currentTimeFactory) {
+        sCurrentTimeFactory = currentTimeFactory;
+    }
+
+    static void setStateChangeScheduler(StateChangeScheduler stateChangeScheduler) {
+        if (stateChangeScheduler == null) {
+            stateChangeScheduler = new AlarmManagerStateChangeScheduler();
+        }
+        sStateChangeScheduler = stateChangeScheduler;
+    }
+
     public static int getGlobalIntentId(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         return prefs.getInt(ALARM_GLOBAL_ID_EXTRA, -1);
@@ -150,14 +175,7 @@
      * @param context application context
      */
     public static void updateNextAlarm(Context context) {
-        AlarmInstance nextAlarm = null;
-        ContentResolver cr = context.getContentResolver();
-        String activeAlarmQuery = AlarmInstance.ALARM_STATE + "<" + AlarmInstance.FIRED_STATE;
-        for (AlarmInstance instance : AlarmInstance.getInstances(cr, activeAlarmQuery)) {
-            if (nextAlarm == null || instance.getAlarmTime().before(nextAlarm.getAlarmTime())) {
-                nextAlarm = instance;
-            }
-        }
+        final AlarmInstance nextAlarm = getNextFiringAlarm(context);
 
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             updateNextAlarmInSystemSettings(context, nextAlarm);
@@ -167,6 +185,25 @@
     }
 
     /**
+     * Returns an alarm instance of an alarm that's going to fire next.
+     * @param context application context
+     * @return an alarm instance that will fire earliest relative to current time.
+     */
+    public static AlarmInstance getNextFiringAlarm(Context context) {
+        final ContentResolver cr = context.getContentResolver();
+        final String activeAlarmQuery = AlarmInstance.ALARM_STATE + "<" + AlarmInstance.FIRED_STATE;
+        final List<AlarmInstance> alarmInstances = AlarmInstance.getInstances(cr, activeAlarmQuery);
+
+        AlarmInstance nextAlarm = null;
+        for (AlarmInstance instance : alarmInstances) {
+            if (nextAlarm == null || instance.getAlarmTime().before(nextAlarm.getAlarmTime())) {
+                nextAlarm = instance;
+            }
+        }
+        return nextAlarm;
+    }
+
+    /**
      * Used in pre-L devices, where "next alarm" is stored in system settings.
      */
     private static void updateNextAlarmInSystemSettings(Context context, AlarmInstance nextAlarm) {
@@ -246,14 +283,8 @@
                 Alarm.updateAlarm(cr, alarm);
             }
         } else {
-            // This is a optimization for really old alarm instances. This prevent us
-            // from scheduling and dismissing alarms up to current time.
-            Calendar currentTime = Calendar.getInstance();
-            Calendar alarmTime = instance.getAlarmTime();
-            if (currentTime.after(alarmTime)) {
-                alarmTime = currentTime;
-            }
-            AlarmInstance nextRepeatedInstance = alarm.createInstanceAfter(alarmTime);
+            // Schedule the next repeating instance after the current time
+            AlarmInstance nextRepeatedInstance = alarm.createInstanceAfter(getCurrentTime());
             LogUtils.i("Creating new instance for repeating alarm " + alarm.id + " at " +
                     AlarmUtils.getFormattedTime(context, nextRepeatedInstance.getAlarmTime()));
             AlarmInstance.addInstance(cr, nextRepeatedInstance);
@@ -285,47 +316,24 @@
     /**
      * Schedule alarm instance state changes with {@link AlarmManager}.
      *
-     * @param context application context
+     * @param ctx application context
      * @param time to trigger state change
      * @param instance to change state to
      * @param newState to change to
      */
-    private static void scheduleInstanceStateChange(Context context, Calendar time,
+    private static void scheduleInstanceStateChange(Context ctx, Calendar time,
             AlarmInstance instance, int newState) {
-        long timeInMillis = time.getTimeInMillis();
-        LogUtils.v("Scheduling state change " + newState + " to instance " + instance.mId +
-                " at " + AlarmUtils.getFormattedTime(context, time) + " (" + timeInMillis + ")");
-        Intent stateChangeIntent = createStateChangeIntent(context, ALARM_MANAGER_TAG, instance,
-                newState);
-        // Treat alarm state change as high priority, use foreground broadcasts
-        stateChangeIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(context, instance.hashCode(),
-                stateChangeIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-        AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-        if (Utils.isKitKatOrLater()) {
-            am.setExact(AlarmManager.RTC_WAKEUP, timeInMillis, pendingIntent);
-        } else {
-            am.set(AlarmManager.RTC_WAKEUP, timeInMillis, pendingIntent);
-        }
+        sStateChangeScheduler.scheduleInstanceStateChange(ctx, time, instance, newState);
     }
 
     /**
      * Cancel all {@link AlarmManager} timers for instance.
      *
-     * @param context application context
+     * @param ctx application context
      * @param instance to disable all {@link AlarmManager} timers
      */
-    private static void cancelScheduledInstance(Context context, AlarmInstance instance) {
-        LogUtils.v("Canceling instance " + instance.mId + " timers");
-
-        // Create a PendingIntent that will match any one set for this instance
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(context, instance.hashCode(),
-                createStateChangeIntent(context, ALARM_MANAGER_TAG, instance, null),
-                PendingIntent.FLAG_UPDATE_CURRENT);
-
-        AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-        am.cancel(pendingIntent);
+    private static void cancelScheduledInstanceStateChange(Context ctx, AlarmInstance instance) {
+        sStateChangeScheduler.cancelScheduledInstanceStateChange(ctx, instance);
     }
 
 
@@ -433,6 +441,12 @@
         instance.mAlarmState = AlarmInstance.FIRED_STATE;
         AlarmInstance.updateInstance(contentResolver, instance);
 
+        if (instance.mAlarmId != null) {
+            // if the time changed *backward* and pushed an instance from missed back to fired,
+            // remove any other scheduled instances that may exist
+            AlarmInstance.deleteOtherInstances(contentResolver, instance.mAlarmId, instance.mId);
+        }
+
         // Start the alarm and schedule timeout timer for it
         AlarmService.startAlarm(context, instance);
 
@@ -454,14 +468,15 @@
      * @param instance to set state to
      *
      */
-    public static void setSnoozeState(Context context, AlarmInstance instance, boolean showToast) {
+    public static void setSnoozeState(final Context context, AlarmInstance instance,
+                                      boolean showToast) {
         // Stop alarm if this instance is firing it
         AlarmService.stopAlarm(context, instance);
 
         // Calculate the new snooze alarm time
         String snoozeMinutesStr = PreferenceManager.getDefaultSharedPreferences(context)
                 .getString(SettingsActivity.KEY_ALARM_SNOOZE, DEFAULT_SNOOZE_MINUTES);
-        int snoozeMinutes = Integer.parseInt(snoozeMinutesStr);
+        final int snoozeMinutes = Integer.parseInt(snoozeMinutesStr);
         Calendar newAlarmTime = Calendar.getInstance();
         newAlarmTime.add(Calendar.MINUTE, snoozeMinutes);
 
@@ -479,9 +494,17 @@
 
         // Display the snooze minutes in a toast.
         if (showToast) {
-            String displayTime = String.format(context.getResources().getQuantityText
-                    (R.plurals.alarm_alert_snooze_set, snoozeMinutes).toString(), snoozeMinutes);
-            Toast.makeText(context, displayTime, Toast.LENGTH_LONG).show();
+            final Handler mainHandler = new Handler(context.getMainLooper());
+            final Runnable myRunnable = new Runnable() {
+                @Override
+                public void run() {
+                    String displayTime = String.format(context.getResources().getQuantityText
+                            (R.plurals.alarm_alert_snooze_set, snoozeMinutes).toString(),
+                            snoozeMinutes);
+                    Toast.makeText(context, displayTime, Toast.LENGTH_LONG).show();
+                }
+            };
+            mainHandler.post(myRunnable);
         }
 
         // Instance time changed, so find next alarm that will fire and notify system
@@ -527,6 +550,35 @@
     }
 
     /**
+     * This will set the alarm instance to the PREDISMISSED_STATE and schedule an instance state
+     * change to DISMISSED_STATE at the regularly scheduled firing time.
+     * @param context
+     * @param instance
+     */
+    public static void setPreDismissState(Context context, AlarmInstance instance) {
+        LogUtils.v("Setting predismissed state to instance " + instance.mId);
+
+        // Update alarm in db
+        final ContentResolver contentResolver = context.getContentResolver();
+        instance.mAlarmState = AlarmInstance.PREDISMISSED_STATE;
+        AlarmInstance.updateInstance(contentResolver, instance);
+
+        // Setup instance notification and scheduling timers
+        AlarmNotifications.clearNotification(context, instance);
+        scheduleInstanceStateChange(context, instance.getAlarmTime(), instance,
+                AlarmInstance.DISMISSED_STATE);
+
+        final Alarm alarm = Alarm.getAlarm(contentResolver, instance.mAlarmId);
+        // if it's a one time alarm set the toggle to off
+        if (alarm != null && !alarm.daysOfWeek.isRepeating()) {
+            // Check parent if it needs to reschedule, disable or delete itself
+            if (instance.mAlarmId != null) {
+                updateParentAlarm(context, instance);
+            }
+        }
+    }
+
+    /**
      * This will set the alarm instance to the SILENT_STATE and update
      * the application notifications and schedule any state changes that need
      * to occur in the future.
@@ -563,7 +615,7 @@
         // Stop alarm if this instance is firing it
         AlarmService.stopAlarm(context, instance);
         AlarmNotifications.clearNotification(context, instance);
-        cancelScheduledInstance(context, instance);
+        cancelScheduledInstanceStateChange(context, instance);
     }
 
     /**
@@ -577,6 +629,7 @@
      *
      * <ul>
      *     <li>Make sure all dismissed alarms are never re-activated</li>
+     *     <li>Make sure pre-dismissed alarms stay predismissed</li>
      *     <li>Make sure firing alarms stayed fired unless they should be auto-silenced</li>
      *     <li>Missed instance that have parents should be re-enabled if we went back in time</li>
      *     <li>If alarm was SNOOZED, then show the notification but don't update time</li>
@@ -591,12 +644,14 @@
      */
     public static void registerInstance(Context context, AlarmInstance instance,
             boolean updateNextAlarm) {
-        Calendar currentTime = Calendar.getInstance();
-        Calendar alarmTime = instance.getAlarmTime();
-        Calendar timeoutTime = instance.getTimeout(context);
-        Calendar lowNotificationTime = instance.getLowNotificationTime();
-        Calendar highNotificationTime = instance.getHighNotificationTime();
-        Calendar missedTTL = instance.getMissedTimeToLive();
+        final ContentResolver cr = context.getContentResolver();
+        final Alarm alarm = Alarm.getAlarm(cr, instance.mAlarmId);
+        final Calendar currentTime = getCurrentTime();
+        final Calendar alarmTime = instance.getAlarmTime();
+        final Calendar timeoutTime = instance.getTimeout(context);
+        final Calendar lowNotificationTime = instance.getLowNotificationTime();
+        final Calendar highNotificationTime = instance.getHighNotificationTime();
+        final Calendar missedTTL = instance.getMissedTimeToLive();
 
         // Handle special use cases here
         if (instance.mAlarmState == AlarmInstance.DISMISSED_STATE) {
@@ -626,11 +681,16 @@
 
                 // Make sure we re-enable the parent alarm of the instance
                 // because it will get activated by by the below code
-                ContentResolver cr = context.getContentResolver();
-                Alarm alarm = Alarm.getAlarm(cr, instance.mAlarmId);
                 alarm.enabled = true;
                 Alarm.updateAlarm(cr, alarm);
             }
+        } else if (instance.mAlarmState == AlarmInstance.PREDISMISSED_STATE) {
+            if (currentTime.before(alarmTime)) {
+                setPreDismissState(context, instance);
+            } else {
+                setDismissState(context, instance);
+            }
+            return;
         }
 
         // Fix states that are time sensitive
@@ -693,18 +753,47 @@
     }
 
     /**
+     * Dismiss all snoozed alarms
+     */
+    public static void dismissSnoozedAlarms(Context context) {
+        ContentResolver contentResolver = context.getContentResolver();
+        for (AlarmInstance instance : AlarmInstance.getInstances(contentResolver, null)) {
+            if (instance.mAlarmState == AlarmInstance.SNOOZE_STATE) {
+                AlarmStateManager.setDismissState(context, instance);
+            }
+        }
+    }
+
+    /**
      * Fix and update all alarm instance when a time change event occurs.
      *
      * @param context application context
      */
     public static void fixAlarmInstances(Context context) {
         // Register all instances after major time changes or when phone restarts
-        // TODO: Refactor this code to not use the overloaded registerInstance method.
-        ContentResolver contentResolver = context.getContentResolver();
+        final ContentResolver contentResolver = context.getContentResolver();
+        final Calendar currentTime = getCurrentTime();
         for (AlarmInstance instance : AlarmInstance.getInstances(contentResolver, null)) {
-            AlarmStateManager.registerInstance(context, instance, false);
+            final Alarm alarm = Alarm.getAlarm(contentResolver, instance.mAlarmId);
+            final Calendar priorAlarmTime = alarm.getPreviousAlarmTime(instance.getAlarmTime());
+            final Calendar missedTTLTime = instance.getMissedTimeToLive();
+            if (currentTime.before(priorAlarmTime) || currentTime.after(missedTTLTime)) {
+                final Calendar oldAlarmTime = instance.getAlarmTime();
+                final Calendar newAlarmTime = alarm.getNextAlarmTime(currentTime);
+                final CharSequence oldTime = DateFormat.format("MM/dd/yyyy hh:mm a", oldAlarmTime);
+                final CharSequence newTime = DateFormat.format("MM/dd/yyyy hh:mm a", newAlarmTime);
+                LogUtils.i("A time change has caused an existing alarm scheduled to fire at %s to" +
+                        " be replaced by a new alarm scheduled to fire at %s", oldTime, newTime);
+
+                // The time change is so dramatic the AlarmInstance doesn't make any sense;
+                // remove it and schedule the new appropriate instance.
+                AlarmStateManager.setDismissState(context, instance);
+            } else {
+                registerInstance(context, instance, false);
+            }
         }
-        AlarmStateManager.updateNextAlarm(context);
+        
+        updateNextAlarm(context);
     }
 
     /**
@@ -741,6 +830,9 @@
             case AlarmInstance.MISSED_STATE:
                 setMissedState(context, instance);
                 break;
+            case AlarmInstance.PREDISMISSED_STATE:
+                setPreDismissState(context, instance);
+                break;
             case AlarmInstance.DISMISSED_STATE:
                 setDismissState(context, instance);
                 break;
@@ -813,6 +905,16 @@
             AlarmInstance instance = AlarmInstance.getInstance(context.getContentResolver(),
                     AlarmInstance.getId(uri));
 
+            if (instance == null) {
+                LogUtils.e("Null alarminstance for SHOW_AND_DISMISS");
+                // dismiss the notification
+                final int id = intent.getIntExtra(AlarmNotifications.EXTRA_NOTIFICATION_ID, -1);
+                if (id != -1) {
+                    NotificationManagerCompat.from(context).cancel(id);
+                }
+                return;
+            }
+
             long alarmId = instance.mAlarmId == null ? Alarm.INVALID_ID : instance.mAlarmId;
             Intent viewAlarmIntent = Alarm.createIntent(context, DeskClock.class, alarmId);
             viewAlarmIntent.putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.ALARM_TAB_INDEX);
@@ -830,4 +932,67 @@
     public static Intent createIndicatorIntent(Context context) {
         return new Intent(context, AlarmStateManager.class).setAction(INDICATOR_ACTION);
     }
+
+    /**
+     * Abstract away how the current time is computed. If no implementation of this interface is
+     * given the default is to return {@link Calendar#getInstance()}. Otherwise, the factory
+     * instance is consulted for the current time.
+     */
+    interface CurrentTimeFactory {
+        Calendar getCurrentTime();
+    }
+
+    /**
+     * Abstracts away how state changes are scheduled. The {@link AlarmManagerStateChangeScheduler}
+     * implementation schedules callbacks within the system AlarmManager. Alternate
+     * implementations, such as test case mocks can subvert this behavior.
+     */
+    interface StateChangeScheduler {
+        void scheduleInstanceStateChange(Context context, Calendar time,
+                AlarmInstance instance, int newState);
+
+        void cancelScheduledInstanceStateChange(Context context, AlarmInstance instance);
+    }
+
+    /**
+     * Schedules state change callbacks within the AlarmManager.
+     */
+    private static class AlarmManagerStateChangeScheduler implements StateChangeScheduler {
+        @Override
+        public void scheduleInstanceStateChange(Context context, Calendar time,
+                AlarmInstance instance, int newState) {
+            final long timeInMillis = time.getTimeInMillis();
+            LogUtils.v("Scheduling state change %d to instance %d at %s (%d)", newState,
+                    instance.mId, AlarmUtils.getFormattedTime(context, time), timeInMillis);
+            final Intent stateChangeIntent =
+                    createStateChangeIntent(context, ALARM_MANAGER_TAG, instance, newState);
+            // Treat alarm state change as high priority, use foreground broadcasts
+            stateChangeIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+            PendingIntent pendingIntent = PendingIntent.getBroadcast(context, instance.hashCode(),
+                    stateChangeIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+            final AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+            if (Utils.isKitKatOrLater()) {
+                am.setExact(AlarmManager.RTC_WAKEUP, timeInMillis, pendingIntent);
+            } else {
+                am.set(AlarmManager.RTC_WAKEUP, timeInMillis, pendingIntent);
+            }
+        }
+
+        @Override
+        public void cancelScheduledInstanceStateChange(Context context, AlarmInstance instance) {
+            LogUtils.v("Canceling instance " + instance.mId + " timers");
+
+            // Create a PendingIntent that will match any one set for this instance
+            PendingIntent pendingIntent = PendingIntent.getBroadcast(context, instance.hashCode(),
+                    createStateChangeIntent(context, ALARM_MANAGER_TAG, instance, null),
+                    PendingIntent.FLAG_NO_CREATE);
+
+            if (pendingIntent != null) {
+                AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+                am.cancel(pendingIntent);
+                pendingIntent.cancel();
+            }
+        }
+    }
 }
diff --git a/src/com/android/deskclock/events/Events.java b/src/com/android/deskclock/events/Events.java
index 4e18be8..1a5d540 100644
--- a/src/com/android/deskclock/events/Events.java
+++ b/src/com/android/deskclock/events/Events.java
@@ -31,6 +31,10 @@
         sEventTrackers.add(eventTracker);
     }
 
+    public static void removeEventTracker(EventTracker eventTracker) {
+        sEventTrackers.remove(eventTracker);
+    }
+
     /**
      * Tracks an alarm event.
      *
diff --git a/src/com/android/deskclock/provider/Alarm.java b/src/com/android/deskclock/provider/Alarm.java
index 5494cb8..54389e1 100644
--- a/src/com/android/deskclock/provider/Alarm.java
+++ b/src/com/android/deskclock/provider/Alarm.java
@@ -185,6 +185,14 @@
         return result;
     }
 
+    public static boolean isTomorrow(Alarm alarm) {
+        final Calendar now = Calendar.getInstance();
+        final int alarmHour = alarm.hour;
+        final int currHour = now.get(Calendar.HOUR_OF_DAY);
+        return alarmHour < currHour ||
+                (alarmHour == currHour && alarm.minutes <= now.get(Calendar.MINUTE));
+    }
+
     public static Alarm addAlarm(ContentResolver contentResolver, Alarm alarm) {
         ContentValues values = createContentValues(alarm);
         Uri uri = contentResolver.insert(CONTENT_URI, values);
@@ -306,8 +314,32 @@
         return result;
     }
 
+    /**
+     *
+     * @param currentTime
+     * @return Previous firing time, or null if this is a one-time alarm.
+     */
+    public Calendar getPreviousAlarmTime(Calendar currentTime) {
+        Calendar previousInstanceTime = Calendar.getInstance();
+        previousInstanceTime.set(Calendar.YEAR, currentTime.get(Calendar.YEAR));
+        previousInstanceTime.set(Calendar.MONTH, currentTime.get(Calendar.MONTH));
+        previousInstanceTime.set(Calendar.DAY_OF_MONTH, currentTime.get(Calendar.DAY_OF_MONTH));
+        previousInstanceTime.set(Calendar.HOUR_OF_DAY, hour);
+        previousInstanceTime.set(Calendar.MINUTE, minutes);
+        previousInstanceTime.set(Calendar.SECOND, 0);
+        previousInstanceTime.set(Calendar.MILLISECOND, 0);
+
+        int subtractDays = daysOfWeek.calculateDaysToPreviousAlarm(previousInstanceTime);
+        if (subtractDays > 0) {
+            previousInstanceTime.add(Calendar.DAY_OF_WEEK, -subtractDays);
+            return previousInstanceTime;
+        } else {
+            return null;
+        }
+    }
+
     public Calendar getNextAlarmTime(Calendar currentTime) {
-        Calendar nextInstanceTime = Calendar.getInstance();
+        final Calendar nextInstanceTime = Calendar.getInstance();
         nextInstanceTime.set(Calendar.YEAR, currentTime.get(Calendar.YEAR));
         nextInstanceTime.set(Calendar.MONTH, currentTime.get(Calendar.MONTH));
         nextInstanceTime.set(Calendar.DAY_OF_MONTH, currentTime.get(Calendar.DAY_OF_MONTH));
diff --git a/src/com/android/deskclock/provider/AlarmInstance.java b/src/com/android/deskclock/provider/AlarmInstance.java
index 518e94d..03d6a0e 100644
--- a/src/com/android/deskclock/provider/AlarmInstance.java
+++ b/src/com/android/deskclock/provider/AlarmInstance.java
@@ -91,7 +91,6 @@
     private static final int ALARM_STATE_INDEX = 10;
 
     private static final int COLUMN_COUNT = ALARM_STATE_INDEX + 1;
-    private Calendar mTimeout;
 
     public static ContentValues createContentValues(AlarmInstance instance) {
         ContentValues values = new ContentValues(COLUMN_COUNT);
@@ -172,6 +171,27 @@
     }
 
     /**
+     * Get the next instance of an alarm given its alarmId
+     * @param contentResolver to perform query on
+     * @param alarmId of instance desired
+     * @return the next instance of an alarm by alarmId.
+     */
+    public static AlarmInstance getNextUpcomingInstanceByAlarmId(ContentResolver contentResolver,
+                                                                 long alarmId) {
+        final List<AlarmInstance> alarmInstances = getInstancesByAlarmId(contentResolver, alarmId);
+        if (alarmInstances.isEmpty()) {
+            return null;
+        }
+        AlarmInstance nextAlarmInstance = alarmInstances.get(0);
+        for (AlarmInstance instance : alarmInstances) {
+            if (instance.getAlarmTime().before(nextAlarmInstance.getAlarmTime())) {
+                nextAlarmInstance = instance;
+            }
+        }
+        return nextAlarmInstance;
+    }
+
+    /**
      * Get alarm instance by id and state.
      */
     public static List<AlarmInstance> getInstancesByInstanceIdAndState(
@@ -258,6 +278,21 @@
         return deletedRows == 1;
     }
 
+    /**
+     * @param contentResolver to access the content provider
+     * @param alarmId identifies the alarm in question
+     * @param instanceId identifies the instance to keep; all other instances will be removed
+     */
+    public static void deleteOtherInstances(ContentResolver contentResolver, long alarmId,
+            long instanceId) {
+        final List<AlarmInstance> instances = getInstancesByAlarmId(contentResolver, alarmId);
+        for (AlarmInstance instance : instances) {
+            if (instance.mId != instanceId) {
+                deleteInstance(contentResolver, instance.mId);
+            }
+        }
+    }
+
     // Public fields
     public long mId;
     public int mYear;
diff --git a/src/com/android/deskclock/provider/ClockContract.java b/src/com/android/deskclock/provider/ClockContract.java
index 0cf1a17..20aed2a 100644
--- a/src/com/android/deskclock/provider/ClockContract.java
+++ b/src/com/android/deskclock/provider/ClockContract.java
@@ -204,6 +204,11 @@
         public static final int DISMISSED_STATE = 7;
 
         /**
+         * Alarm state when alarm has been dismissed before its intended firing time.
+         */
+        public static final int PREDISMISSED_STATE = 8;
+
+        /**
          * Alarm year.
          *
          * <p>Type: INTEGER</p>
diff --git a/src/com/android/deskclock/provider/DaysOfWeek.java b/src/com/android/deskclock/provider/DaysOfWeek.java
index ad5329e..9673be5 100644
--- a/src/com/android/deskclock/provider/DaysOfWeek.java
+++ b/src/com/android/deskclock/provider/DaysOfWeek.java
@@ -168,20 +168,53 @@
     }
 
     /**
-     * Returns number of days from today until next alarm.
+     * Returns number of days backwards from today to previous alarm.
+     * ex:
+     * Daily alarm, current = Tuesday -> 1
+     * Weekly alarm on Wednesday, current = Tuesday -> 6
+     * One time alarm -> -1
      *
      * @param current must be set to today
      */
+    public int calculateDaysToPreviousAlarm(Calendar current) {
+        if (!isRepeating()) {
+            return -1;
+        }
+
+        // We only use this on preemptively dismissed alarms, and alarms can only fire once a day,
+        // so there is no chance that the previous fire time is on the same day. Start dayCount on
+        // previous day.
+        int dayCount = -1;
+        int currentDayIndex = convertDayToBitIndex(current.get(Calendar.DAY_OF_WEEK));
+        for (; dayCount >= -DAYS_IN_A_WEEK; dayCount--) {
+            int previousAlarmBitIndex = (currentDayIndex + dayCount);
+            if (previousAlarmBitIndex < 0) {
+                // Ex. previousAlarmBitIndex = -1 means the day before index 0 = index 6
+                previousAlarmBitIndex = previousAlarmBitIndex + DAYS_IN_A_WEEK;
+            }
+            if (isBitEnabled(previousAlarmBitIndex)) {
+                break;
+            }
+        }
+        // return a positive value
+        return dayCount * -1;
+    }
+
+    /**
+     * Returns number of days from today until next alarm.
+     *
+     * @param current must be set to today or the day after the currentTime
+     */
     public int calculateDaysToNextAlarm(Calendar current) {
         if (!isRepeating()) {
             return -1;
         }
 
         int dayCount = 0;
-        int currentDayBit = convertDayToBitIndex(current.get(Calendar.DAY_OF_WEEK));
+        int currentDayIndex = convertDayToBitIndex(current.get(Calendar.DAY_OF_WEEK));
         for (; dayCount < DAYS_IN_A_WEEK; dayCount++) {
-            int nextAlarmBit = (currentDayBit + dayCount) % DAYS_IN_A_WEEK;
-            if (isBitEnabled(nextAlarmBit)) {
+            int nextAlarmBitIndex = (currentDayIndex + dayCount) % DAYS_IN_A_WEEK;
+            if (isBitEnabled(nextAlarmBitIndex)) {
                 break;
             }
         }
diff --git a/src/com/android/deskclock/stopwatch/StopwatchFragment.java b/src/com/android/deskclock/stopwatch/StopwatchFragment.java
index 2a53929..5ba6dfd 100644
--- a/src/com/android/deskclock/stopwatch/StopwatchFragment.java
+++ b/src/com/android/deskclock/stopwatch/StopwatchFragment.java
@@ -41,6 +41,7 @@
 import com.android.deskclock.CircleTimerView;
 import com.android.deskclock.DeskClock;
 import com.android.deskclock.DeskClockFragment;
+import com.android.deskclock.HandleDeskClockApiCalls;
 import com.android.deskclock.LogUtils;
 import com.android.deskclock.R;
 import com.android.deskclock.Utils;
@@ -293,7 +294,7 @@
                 doStop();
                 Events.sendStopwatchEvent(R.string.action_stop, R.string.label_deskclock);
 
-                intent.setAction(Stopwatches.STOP_STOPWATCH);
+                intent.setAction(HandleDeskClockApiCalls.ACTION_STOP_STOPWATCH);
                 context.startService(intent);
                 releaseWakeLock();
                 break;
@@ -303,7 +304,7 @@
                 doStart(time);
                 Events.sendStopwatchEvent(R.string.action_start, R.string.label_deskclock);
 
-                intent.setAction(Stopwatches.START_STOPWATCH);
+                intent.setAction(HandleDeskClockApiCalls.ACTION_START_STOPWATCH);
                 context.startService(intent);
                 acquireWakeLock();
                 break;
@@ -729,9 +730,7 @@
             if (mTime != null) {
                 mTimeText.setTime(totalTime, true, true);
             }
-            if (mLapsAdapter.getCount() > 0) {
-                updateCurrentLap(totalTime);
-            }
+            updateCurrentLap(totalTime);
             mTime.postDelayed(mTimeUpdateThread, mAccessibilityManager != null &&
                     mAccessibilityManager.isTouchExplorationEnabled()
                     ? STOPWATCH_ACCESSIBILTY_REFRESH_INTERVAL_MILLIS
@@ -852,7 +851,7 @@
                 doLap();
                 Events.sendStopwatchEvent(R.string.action_lap, R.string.label_deskclock);
 
-                intent.setAction(Stopwatches.LAP_STOPWATCH);
+                intent.setAction(HandleDeskClockApiCalls.ACTION_LAP_STOPWATCH);
                 context.startService(intent);
                 break;
             case Stopwatches.STOPWATCH_STOPPED:
@@ -860,7 +859,7 @@
                 doReset();
                 Events.sendStopwatchEvent(R.string.action_reset, R.string.label_deskclock);
 
-                intent.setAction(Stopwatches.RESET_STOPWATCH);
+                intent.setAction(HandleDeskClockApiCalls.ACTION_RESET_STOPWATCH);
                 context.startService(intent);
                 releaseWakeLock();
                 break;
diff --git a/src/com/android/deskclock/stopwatch/StopwatchService.java b/src/com/android/deskclock/stopwatch/StopwatchService.java
index 8fbb507..6e10f0d 100644
--- a/src/com/android/deskclock/stopwatch/StopwatchService.java
+++ b/src/com/android/deskclock/stopwatch/StopwatchService.java
@@ -15,6 +15,7 @@
 
 import com.android.deskclock.CircleTimerView;
 import com.android.deskclock.DeskClock;
+import com.android.deskclock.HandleDeskClockApiCalls;
 import com.android.deskclock.R;
 import com.android.deskclock.Utils;
 
@@ -63,61 +64,79 @@
         long actionTime = intent.getLongExtra(Stopwatches.MESSAGE_TIME, Utils.getTimeNow());
         boolean showNotif = intent.getBooleanExtra(Stopwatches.SHOW_NOTIF, true);
         boolean updateCircle = showNotif; // Don't save updates to the cirle if we're in the app.
-        if (actionType.equals(Stopwatches.START_STOPWATCH)) {
-            mStartTime = actionTime;
-            writeSharedPrefsStarted(mStartTime, updateCircle);
-            if (showNotif) {
-                setNotification(mStartTime - mElapsedTime, true, mNumLaps);
-            } else {
-                saveNotification(mStartTime - mElapsedTime, true, mNumLaps);
-            }
-        } else if (actionType.equals(Stopwatches.LAP_STOPWATCH)) {
-            mNumLaps++;
-            long lapTimeElapsed = actionTime - mStartTime + mElapsedTime;
-            writeSharedPrefsLap(lapTimeElapsed, updateCircle);
-            if (showNotif) {
-                setNotification(mStartTime - mElapsedTime, true, mNumLaps);
-            } else {
-                saveNotification(mStartTime - mElapsedTime, true, mNumLaps);
-            }
-        } else if (actionType.equals(Stopwatches.STOP_STOPWATCH)) {
-            mElapsedTime = mElapsedTime + (actionTime - mStartTime);
-            writeSharedPrefsStopped(mElapsedTime, updateCircle);
-            if (showNotif) {
-                setNotification(actionTime - mElapsedTime, false, mNumLaps);
-            } else {
-                saveNotification(mElapsedTime, false, mNumLaps);
-            }
-        } else if (actionType.equals(Stopwatches.RESET_STOPWATCH)) {
-            mLoadApp = false;
-            writeSharedPrefsReset(updateCircle);
-            clearSavedNotification();
-            stopSelf();
-        } else if (actionType.equals(Stopwatches.RESET_AND_LAUNCH_STOPWATCH)) {
-            mLoadApp = true;
-            writeSharedPrefsReset(updateCircle);
-            clearSavedNotification();
-            closeNotificationShade();
-            stopSelf();
-        } else if (actionType.equals(Stopwatches.SHARE_STOPWATCH)) {
-            closeNotificationShade();
-            Intent shareIntent = new Intent(android.content.Intent.ACTION_SEND);
-            shareIntent.setType("text/plain");
-            shareIntent.putExtra(
-                    Intent.EXTRA_SUBJECT, Stopwatches.getShareTitle(getApplicationContext()));
-            shareIntent.putExtra(Intent.EXTRA_TEXT, Stopwatches.buildShareResults(
-                    getApplicationContext(), mElapsedTime, readLapsFromPrefs()));
-            Intent chooserIntent = Intent.createChooser(shareIntent, null);
-            chooserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            getApplication().startActivity(chooserIntent);
-        } else if (actionType.equals(Stopwatches.SHOW_NOTIF)) {
-            // SHOW_NOTIF sent from the DeskClock.onPause
-            // If a notification is not displayed, this service's work is over
-            if (!showSavedNotification()) {
+        switch(actionType) {
+            case HandleDeskClockApiCalls.ACTION_START_STOPWATCH:
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this) ;
+                prefs.edit().putBoolean(Stopwatches.NOTIF_CLOCK_RUNNING, true).apply();
+
+                mStartTime = actionTime;
+                writeSharedPrefsStarted(mStartTime, updateCircle);
+                if (showNotif) {
+                    setNotification(mStartTime - mElapsedTime, true, mNumLaps);
+                } else {
+                    saveNotification(mStartTime - mElapsedTime, true, mNumLaps);
+                }
+                break;
+            case HandleDeskClockApiCalls.ACTION_LAP_STOPWATCH:
+                mNumLaps++;
+                long lapTimeElapsed = actionTime - mStartTime + mElapsedTime;
+                writeSharedPrefsLap(lapTimeElapsed, updateCircle);
+                if (showNotif) {
+                    setNotification(mStartTime - mElapsedTime, true, mNumLaps);
+                } else {
+                    saveNotification(mStartTime - mElapsedTime, true, mNumLaps);
+                }
+                break;
+            case HandleDeskClockApiCalls.ACTION_STOP_STOPWATCH:
+                prefs = PreferenceManager.getDefaultSharedPreferences(this);
+                prefs.edit().putBoolean(Stopwatches.NOTIF_CLOCK_RUNNING, false).apply();
+
+                mElapsedTime = mElapsedTime + (actionTime - mStartTime);
+                writeSharedPrefsStopped(mElapsedTime, updateCircle);
+                if (showNotif) {
+                    setNotification(actionTime - mElapsedTime, false, mNumLaps);
+                } else {
+                    saveNotification(mElapsedTime, false, mNumLaps);
+                }
+                break;
+            case HandleDeskClockApiCalls.ACTION_RESET_STOPWATCH:
+                mLoadApp = false;
+                writeSharedPrefsReset(updateCircle);
+                clearSavedNotification();
                 stopSelf();
-            }
-        } else if (actionType.equals(Stopwatches.KILL_NOTIF)) {
-            mNotificationManager.cancel(NOTIFICATION_ID);
+                break;
+            case Stopwatches.RESET_AND_LAUNCH_STOPWATCH:
+                mLoadApp = true;
+                writeSharedPrefsReset(updateCircle);
+                clearSavedNotification();
+                closeNotificationShade();
+                stopSelf();
+                break;
+            case Stopwatches.SHARE_STOPWATCH:
+                if  (mElapsedTime > 0) {
+                    closeNotificationShade();
+                    Intent shareIntent = new Intent(android.content.Intent.ACTION_SEND);
+                    shareIntent.setType("text/plain");
+                    shareIntent.putExtra(Intent.EXTRA_SUBJECT, Stopwatches.getShareTitle(
+                            getApplicationContext()));
+                    shareIntent.putExtra(Intent.EXTRA_TEXT, Stopwatches.buildShareResults(
+                            getApplicationContext(), mElapsedTime, readLapsFromPrefs()));
+                    Intent chooserIntent = Intent.createChooser(shareIntent, null);
+                    chooserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    getApplication().startActivity(chooserIntent);
+                }
+                break;
+            case Stopwatches.SHOW_NOTIF:
+                // SHOW_NOTIF sent from the DeskClock.onPause
+                // If a notification is not displayed, this service's work is over
+                if (!showSavedNotification()) {
+                    stopSelf();
+                }
+                break;
+            case Stopwatches.KILL_NOTIF:
+                mNotificationManager.cancel(NOTIFICATION_ID);
+                break;
+
         }
 
         // We want this service to continue running until it is explicitly
@@ -174,7 +193,7 @@
             remoteViewsExpanded.setTextViewText(
                     R.id.swn_left_button, getResources().getText(R.string.sw_lap_button));
             Intent leftButtonIntent = new Intent(context, StopwatchService.class);
-            leftButtonIntent.setAction(Stopwatches.LAP_STOPWATCH);
+            leftButtonIntent.setAction(HandleDeskClockApiCalls.ACTION_LAP_STOPWATCH);
             remoteViewsExpanded.setOnClickPendingIntent(R.id.swn_left_button,
                     PendingIntent.getService(context, 0, leftButtonIntent, 0));
             remoteViewsExpanded.
@@ -185,7 +204,7 @@
             remoteViewsExpanded.setTextViewText(
                     R.id.swn_right_button, getResources().getText(R.string.sw_stop_button));
             Intent rightButtonIntent = new Intent(context, StopwatchService.class);
-            rightButtonIntent.setAction(Stopwatches.STOP_STOPWATCH);
+            rightButtonIntent.setAction(HandleDeskClockApiCalls.ACTION_STOP_STOPWATCH);
             remoteViewsExpanded.setOnClickPendingIntent(R.id.swn_right_button,
                     PendingIntent.getService(context, 0, rightButtonIntent, 0));
             remoteViewsExpanded.
@@ -220,7 +239,7 @@
             remoteViewsExpanded.setTextViewText(
                     R.id.swn_right_button, getResources().getText(R.string.sw_start_button));
             Intent rightButtonIntent = new Intent(context, StopwatchService.class);
-            rightButtonIntent.setAction(Stopwatches.START_STOPWATCH);
+            rightButtonIntent.setAction(HandleDeskClockApiCalls.ACTION_START_STOPWATCH);
             remoteViewsExpanded.setOnClickPendingIntent(R.id.swn_right_button,
                     PendingIntent.getService(context, 0, rightButtonIntent, 0));
             remoteViewsExpanded.
@@ -237,7 +256,7 @@
         }
 
         Intent dismissIntent = new Intent(context, StopwatchService.class);
-        dismissIntent.setAction(Stopwatches.RESET_STOPWATCH);
+        dismissIntent.setAction(HandleDeskClockApiCalls.ACTION_RESET_STOPWATCH);
 
         Notification notification = new NotificationCompat.Builder(context)
                 .setAutoCancel(!clockRunning)
diff --git a/src/com/android/deskclock/stopwatch/Stopwatches.java b/src/com/android/deskclock/stopwatch/Stopwatches.java
index a84bb8e..68b2c69 100644
--- a/src/com/android/deskclock/stopwatch/Stopwatches.java
+++ b/src/com/android/deskclock/stopwatch/Stopwatches.java
@@ -28,10 +28,6 @@
  */
 public class Stopwatches {
     // Actions processed by stopwatch receiver
-    public static final String START_STOPWATCH = "start_stopwatch";
-    public static final String LAP_STOPWATCH = "lap_stopwatch";
-    public static final String STOP_STOPWATCH = "stop_stopwatch";
-    public static final String RESET_STOPWATCH = "reset_stopwatch";
     public static final String SHARE_STOPWATCH = "share_stopwatch";
     public static final String RESET_AND_LAUNCH_STOPWATCH = "reset_and_launch_stopwatch";
     public static final String MESSAGE_TIME = "message_time";
diff --git a/src/com/android/deskclock/timer/CountingTimerView.java b/src/com/android/deskclock/timer/CountingTimerView.java
index cd0b952..278ffd8 100644
--- a/src/com/android/deskclock/timer/CountingTimerView.java
+++ b/src/com/android/deskclock/timer/CountingTimerView.java
@@ -27,7 +27,6 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.accessibility.AccessibilityManager;
-import android.widget.TextView;
 
 import com.android.deskclock.LogUtils;
 import com.android.deskclock.R;
@@ -406,7 +405,7 @@
         if (update) {
             setContentDescription(getTimeStringForAccessibility((int) hours, (int) minutes,
                     (int) seconds, showNeg, getResources()));
-            invalidate();
+            postInvalidateOnAnimation();
         }
     }
 
diff --git a/src/com/android/deskclock/timer/TimerFragment.java b/src/com/android/deskclock/timer/TimerFragment.java
index 4892f51..5397063 100644
--- a/src/com/android/deskclock/timer/TimerFragment.java
+++ b/src/com/android/deskclock/timer/TimerFragment.java
@@ -475,7 +475,7 @@
                     t.setState(TimerObj.STATE_STOPPED);
                     t.mView.pause();
                     t.updateTimeLeft(true);
-                    updateTimerState(t, Timers.TIMER_STOP);
+                    updateTimerState(t, Timers.STOP_TIMER);
                     Events.sendTimerEvent(R.string.action_stop, R.string.label_deskclock);
                     break;
                 case TimerObj.STATE_STOPPED:
@@ -506,7 +506,7 @@
                         t.mView.stop();
                         t.mView.setTime(t.mTimeLeft, false);
                         t.mView.set(t.mOriginalLength, t.mTimeLeft, false);
-                        updateTimerState(t, Timers.TIMER_RESET);
+                        updateTimerState(t, Timers.RESET_TIMER);
                         cancelTimerNotification(t.mTimerId);
                         Events.sendTimerEvent(R.string.action_reset, R.string.label_deskclock);
                     }
@@ -727,7 +727,7 @@
                 t.mView.stop();
                 t.mView.setTime(t.mTimeLeft, false);
                 t.mView.set(t.mOriginalLength, t.mTimeLeft, false);
-                updateTimerState(t, Timers.TIMER_RESET);
+                updateTimerState(t, Timers.RESET_TIMER);
 
                 Events.sendTimerEvent(R.string.action_reset, R.string.label_deskclock);
                 break;
@@ -739,7 +739,7 @@
                 t.mView.setTime(t.mTimeLeft, false);
                 t.mView.set(t.mOriginalLength, t.mTimeLeft, true);
                 t.mView.start();
-                updateTimerState(t, Timers.TIMER_RESET);
+                updateTimerState(t, Timers.RESET_TIMER);
                 Events.sendTimerEvent(R.string.action_add_minute, R.string.label_deskclock);
 
                 updateTimerState(t, Timers.START_TIMER);
diff --git a/src/com/android/deskclock/timer/TimerFullScreenFragment.java b/src/com/android/deskclock/timer/TimerFullScreenFragment.java
index 987628a..4ce5b31 100644
--- a/src/com/android/deskclock/timer/TimerFullScreenFragment.java
+++ b/src/com/android/deskclock/timer/TimerFullScreenFragment.java
@@ -602,7 +602,7 @@
             t.mView.setTime(t.mTimeLeft, false);
             t.mView.set(t.mOriginalLength, t.mTimeLeft, false);
         }
-        updateTimersState(t, Timers.TIMER_RESET);
+        updateTimersState(t, Timers.RESET_TIMER);
         Events.sendTimerEvent(R.string.action_reset, R.string.label_deskclock);
     }
 
@@ -738,7 +738,7 @@
                 t.setState(TimerObj.STATE_RUNNING);
                 t.mStartTime = Utils.getTimeNow();
                 t.mTimeLeft = t.mOriginalLength = TimerObj.MINUTE_IN_MILLIS;
-                updateTimersState(t, Timers.TIMER_RESET);
+                updateTimersState(t, Timers.RESET_TIMER);
                 Events.sendTimerEvent(R.string.action_add_minute, R.string.label_deskclock);
 
                 updateTimersState(t, Timers.START_TIMER);
@@ -753,7 +753,7 @@
                 t.mView.stop();
                 t.mView.setTime(t.mTimeLeft, false);
                 t.mView.set(t.mOriginalLength, t.mTimeLeft, false);
-                updateTimersState(t, Timers.TIMER_RESET);
+                updateTimersState(t, Timers.RESET_TIMER);
 
                 Events.sendTimerEvent(R.string.action_reset, R.string.label_deskclock);
                 break;
@@ -769,7 +769,7 @@
                 t.setState(TimerObj.STATE_STOPPED);
                 t.mView.pause();
                 t.updateTimeLeft(true);
-                updateTimersState(t, Timers.TIMER_STOP);
+                updateTimersState(t, Timers.STOP_TIMER);
 
                 Events.sendTimerEvent(R.string.action_stop, R.string.label_deskclock);
                 break;
diff --git a/src/com/android/deskclock/timer/TimerReceiver.java b/src/com/android/deskclock/timer/TimerReceiver.java
index 4c6baab..17af0f3 100644
--- a/src/com/android/deskclock/timer/TimerReceiver.java
+++ b/src/com/android/deskclock/timer/TimerReceiver.java
@@ -122,7 +122,7 @@
             timersAlert.setFlags(
                     Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NO_USER_ACTION);
             context.startActivity(timersAlert);
-        } else if (Timers.TIMER_RESET.equals(actionType)
+        } else if (Timers.RESET_TIMER.equals(actionType)
                 || Timers.DELETE_TIMER.equals(actionType)
                 || Timers.TIMER_DONE.equals(actionType)) {
             // Stop Ringtone if all timers are not in times-up status
@@ -361,22 +361,20 @@
             return null;
         }
 
-        long hundreds, seconds, minutes, hours;
+        long seconds, minutes, hours;
         seconds = timeLeft / 1000;
         minutes = seconds / 60;
-        seconds = seconds - minutes * 60;
         hours = minutes / 60;
         minutes = minutes - hours * 60;
         if (hours > 99) {
             hours = 0;
         }
 
-        String hourSeq = (hours == 0) ? "" :
-            ( (hours == 1) ? context.getString(R.string.hour) :
-                context.getString(R.string.hours, Long.toString(hours)) );
-        String minSeq = (minutes == 0) ? "" :
-            ( (minutes == 1) ? context.getString(R.string.minute) :
-                context.getString(R.string.minutes, Long.toString(minutes)) );
+        String minSeq = Utils.getNumberFormattedQuantityString(context, R.plurals.minutes,
+                (int) minutes);
+
+        String hourSeq = Utils.getNumberFormattedQuantityString(context, R.plurals.hours,
+                (int) hours);
 
         boolean dispHour = hours > 0;
         boolean dispMinute = minutes > 0;
@@ -410,7 +408,7 @@
         }
     }
 
-    private void cancelInUseNotification(final Context context) {
+    public static void cancelInUseNotification(final Context context) {
         NotificationManagerCompat.from(context).cancel(IN_USE_NOTIFICATION_ID);
     }
 
diff --git a/src/com/android/deskclock/timer/Timers.java b/src/com/android/deskclock/timer/Timers.java
index 989eea4..763afd5 100644
--- a/src/com/android/deskclock/timer/Timers.java
+++ b/src/com/android/deskclock/timer/Timers.java
@@ -25,10 +25,10 @@
 
     // Private actions processed by the receiver
     public static final String START_TIMER = "start_timer";
+    public static final String STOP_TIMER = "stop_timer";
     public static final String DELETE_TIMER = "delete_timer";
+    public static final String RESET_TIMER = "reset_timer";
     public static final String TIMES_UP = "times_up";
-    public static final String TIMER_RESET = "timer_reset";
-    public static final String TIMER_STOP = "timer_stop";
     public static final String TIMER_DONE = "timer_done";
     public static final String TIMER_UPDATE = "timer_update";
 
diff --git a/src/com/android/deskclock/widget/ActionableToastBar.java b/src/com/android/deskclock/widget/ActionableToastBar.java
index 44df882..5f0139e 100644
--- a/src/com/android/deskclock/widget/ActionableToastBar.java
+++ b/src/com/android/deskclock/widget/ActionableToastBar.java
@@ -25,7 +25,6 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -43,12 +42,8 @@
     private Animator mHideAnimation;
     private final int mBottomMarginSizeInConversation;
 
-    /** Icon for the description. */
-    private ImageView mActionDescriptionIcon;
     /** The clickable view */
     private View mActionButton;
-    /** Icon for the action button. */
-    private View mActionIcon;
     /** The view that contains the description. */
     private TextView mActionDescriptionView;
     /** The view that contains the text for the action button. */
@@ -74,10 +69,8 @@
     protected void onFinishInflate() {
         super.onFinishInflate();
 
-        mActionDescriptionIcon = (ImageView) findViewById(R.id.description_icon);
         mActionDescriptionView = (TextView) findViewById(R.id.description_text);
         mActionButton = findViewById(R.id.action_button);
-        mActionIcon = findViewById(R.id.action_icon);
         mActionText = (TextView) findViewById(R.id.action_text);
     }
 
@@ -122,16 +115,7 @@
             }
         });
 
-        // Set description icon.
-        if (descriptionIconResourceId == 0) {
-            mActionDescriptionIcon.setVisibility(GONE);
-        } else {
-            mActionDescriptionIcon.setVisibility(VISIBLE);
-            mActionDescriptionIcon.setImageResource(descriptionIconResourceId);
-        }
-
         mActionDescriptionView.setText(descriptionText);
-        mActionIcon.setVisibility(showActionIcon ? VISIBLE : GONE);
         mActionText.setText(actionTextResource);
 
         mHidden = false;
diff --git a/src/com/android/deskclock/widget/selector/AlarmSelection.java b/src/com/android/deskclock/widget/selector/AlarmSelection.java
new file mode 100644
index 0000000..0cddc1d
--- /dev/null
+++ b/src/com/android/deskclock/widget/selector/AlarmSelection.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.deskclock.widget.selector;
+
+import com.android.deskclock.provider.Alarm;
+
+public class AlarmSelection {
+    private final String mLabel;
+    private final Alarm mAlarm;
+
+    /**
+     * Created a new selectable item with a visual label and an id.
+     * id corresponds to the Alarm id
+     */
+    public AlarmSelection(String label, Alarm alarm) {
+        mLabel = label;
+        mAlarm = alarm;
+    }
+
+    public String getLabel() {
+        return mLabel;
+    }
+
+    public Alarm getAlarm() {
+        return mAlarm;
+    }
+}
diff --git a/src/com/android/deskclock/widget/selector/AlarmSelectionAdapter.java b/src/com/android/deskclock/widget/selector/AlarmSelectionAdapter.java
new file mode 100644
index 0000000..fa8ce56
--- /dev/null
+++ b/src/com/android/deskclock/widget/selector/AlarmSelectionAdapter.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.deskclock.widget.selector;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import com.android.deskclock.R;
+import com.android.deskclock.provider.Alarm;
+import com.android.deskclock.widget.TextTime;
+
+import java.util.List;
+
+public class AlarmSelectionAdapter extends ArrayAdapter<AlarmSelection> {
+
+    public AlarmSelectionAdapter(Context context, int id, List<AlarmSelection> alarms) {
+        super(context, id, alarms);
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        final Context context = getContext();
+        View row = convertView;
+        if (row == null) {
+            final LayoutInflater inflater = LayoutInflater.from(context);
+            row = inflater.inflate(R.layout.alarm_row, parent, false);
+        }
+
+        final AlarmSelection selection = getItem(position);
+        final Alarm alarm = selection.getAlarm();
+
+        final TextTime alarmTime = (TextTime) row.findViewById(R.id.digital_clock);
+        alarmTime.setFormat(context,
+                context.getResources().getDimensionPixelSize(R.dimen.alarm_label_size));
+        alarmTime.setTime(alarm.hour, alarm.minutes);
+
+        final TextView alarmLabel = (TextView) row.findViewById(R.id.label);
+        alarmLabel.setText(alarm.label);
+
+        // find days when alarm is firing
+        final String daysOfWeek;
+        if (!alarm.daysOfWeek.isRepeating()) {
+            daysOfWeek = Alarm.isTomorrow(alarm) ?
+                    context.getResources().getString(R.string.alarm_tomorrow) :
+                    context.getResources().getString(R.string.alarm_today);
+        } else {
+            daysOfWeek = alarm.daysOfWeek.toString(context, 0);
+        }
+
+        final TextView daysOfWeekView = (TextView) row.findViewById(R.id.daysOfWeek);
+        daysOfWeekView.setText(daysOfWeek);
+
+        return row;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/deskclock/widget/sgv/OverScrollerSGV.java b/src/com/android/deskclock/widget/sgv/OverScrollerSGV.java
index a5ce155..636a90e 100644
--- a/src/com/android/deskclock/widget/sgv/OverScrollerSGV.java
+++ b/src/com/android/deskclock/widget/sgv/OverScrollerSGV.java
@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.hardware.SensorManager;
-import android.util.FloatMath;
 import android.util.Log;
 import android.view.ViewConfiguration;
 import android.view.animation.AnimationUtils;
@@ -177,9 +176,7 @@
      * @return The original velocity less the deceleration, norm of the X and Y velocity vector.
      */
     public float getCurrVelocity() {
-        float squaredNorm = mScrollerX.mCurrVelocity * mScrollerX.mCurrVelocity;
-        squaredNorm += mScrollerY.mCurrVelocity * mScrollerY.mCurrVelocity;
-        return FloatMath.sqrt(squaredNorm);
+        return (float) Math.hypot(mScrollerX.mCurrVelocity, mScrollerY.mCurrVelocity);
     }
 
     /**