From bb617e98f88ab30af024827e45b07c357b2a7762 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Fri, 17 Mar 2023 20:46:27 +0530
Subject: [PATCH 1/4] Change app icon to our custom icon

---
 AndroidManifest.xml                     |   2 +-
 res/drawable/e_backgroundclock.xml      |  76 +++++++++++++++
 res/drawable/e_clock.xml                | 111 ++++++++++++++++++++++
 res/drawable/e_hourclock.xml            |  35 +++++++
 res/drawable/e_minuteclock.xml          |  35 +++++++
 res/drawable/e_secondclock.xml          |  35 +++++++
 res/drawable/ic_launcher_background.xml |  28 +++---
 res/drawable/ic_launcher_foreground.xml | 118 ++++++++++++++++++------
 res/drawable/ic_launcher_monochrome.xml |  26 ------
 res/mipmap-anydpi/ic_launcher.xml       |  24 +++--
 10 files changed, 414 insertions(+), 76 deletions(-)
 create mode 100644 res/drawable/e_backgroundclock.xml
 create mode 100644 res/drawable/e_clock.xml
 create mode 100644 res/drawable/e_hourclock.xml
 create mode 100644 res/drawable/e_minuteclock.xml
 create mode 100644 res/drawable/e_secondclock.xml
 delete mode 100644 res/drawable/ic_launcher_monochrome.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2d1168ba6..4b72a1602 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -50,7 +50,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.DeskClock">
 
-        <meta-data android:name="com.android.launcher3.LEVEL_PER_TICK_ICON_ROUND" android:resource="@mipmap/launcher_clock" />
+        <meta-data android:name="com.android.launcher3.LEVEL_PER_TICK_ICON_ROUND" android:resource="@drawable/e_clock" />
         <meta-data android:name="com.android.launcher3.HOUR_LAYER_INDEX" android:value="0" />
         <meta-data android:name="com.android.launcher3.MINUTE_LAYER_INDEX" android:value="1" />
         <meta-data android:name="com.android.launcher3.SECOND_LAYER_INDEX" android:value="2" />
diff --git a/res/drawable/e_backgroundclock.xml b/res/drawable/e_backgroundclock.xml
new file mode 100644
index 000000000..bbed8542f
--- /dev/null
+++ b/res/drawable/e_backgroundclock.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="109dp"
+    android:height="108dp"
+    android:viewportWidth="109"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M0.5,0h108v108h-108z"
+      android:fillColor="#225180"/>
+  <path
+      android:pathData="M54.5,82.36C70.16,82.36 82.86,69.66 82.86,54C82.86,38.34 70.16,25.64 54.5,25.64C38.84,25.64 26.14,38.34 26.14,54C26.14,69.66 38.84,82.36 54.5,82.36Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="54.5"
+          android:startY="52.87"
+          android:endX="54.5"
+          android:endY="111.27"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#FFCBD6EA"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M53.13,29V33.57H52.55V29.72L51.38,30.14V29.62L53.04,29H53.13ZM57.81,33.1V33.57H54.83V33.16L56.32,31.5C56.5,31.29 56.64,31.12 56.74,30.98C56.85,30.83 56.92,30.71 56.96,30.59C57,30.48 57.02,30.36 57.02,30.24C57.02,30.09 56.99,29.96 56.93,29.84C56.87,29.71 56.78,29.62 56.66,29.54C56.54,29.47 56.39,29.43 56.23,29.43C56.02,29.43 55.86,29.47 55.72,29.55C55.59,29.63 55.49,29.74 55.42,29.88C55.35,30.02 55.32,30.18 55.32,30.36H54.74C54.74,30.1 54.8,29.87 54.91,29.66C55.02,29.44 55.19,29.28 55.41,29.15C55.63,29.02 55.9,28.96 56.23,28.96C56.51,28.96 56.76,29.01 56.96,29.11C57.17,29.21 57.32,29.35 57.43,29.54C57.54,29.72 57.6,29.93 57.6,30.18C57.6,30.31 57.58,30.44 57.53,30.58C57.49,30.72 57.42,30.85 57.34,30.99C57.27,31.12 57.18,31.26 57.07,31.39C56.97,31.52 56.86,31.65 56.74,31.78L55.53,33.1H57.81Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M41.87,32.1V36.68H41.29V32.82L40.13,33.25V32.73L41.78,32.1H41.87ZM45.47,32.1V36.68H44.89V32.82L43.73,33.25V32.73L45.38,32.1H45.47Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M33.39,40.52V45.1H32.81V41.24L31.65,41.67V41.15L33.3,40.52H33.39ZM37.95,42.46V43.15C37.95,43.53 37.91,43.84 37.85,44.1C37.78,44.35 37.68,44.56 37.56,44.71C37.43,44.87 37.28,44.98 37.11,45.06C36.93,45.12 36.73,45.16 36.51,45.16C36.34,45.16 36.18,45.14 36.03,45.09C35.88,45.05 35.75,44.98 35.63,44.88C35.51,44.79 35.41,44.66 35.33,44.5C35.24,44.35 35.18,44.16 35.14,43.93C35.09,43.71 35.07,43.45 35.07,43.15V42.46C35.07,42.09 35.1,41.77 35.17,41.52C35.24,41.27 35.34,41.07 35.46,40.91C35.59,40.76 35.74,40.65 35.91,40.58C36.09,40.52 36.29,40.48 36.51,40.48C36.68,40.48 36.85,40.51 36.99,40.55C37.14,40.59 37.28,40.66 37.39,40.75C37.51,40.84 37.61,40.97 37.69,41.12C37.77,41.27 37.84,41.46 37.88,41.68C37.92,41.9 37.95,42.16 37.95,42.46ZM37.37,43.25V42.36C37.37,42.16 37.35,41.98 37.33,41.82C37.3,41.67 37.27,41.53 37.22,41.42C37.18,41.31 37.12,41.22 37.05,41.16C36.98,41.09 36.9,41.04 36.81,41.01C36.72,40.97 36.62,40.96 36.51,40.96C36.37,40.96 36.25,40.98 36.14,41.03C36.03,41.08 35.94,41.16 35.87,41.27C35.8,41.38 35.75,41.53 35.71,41.71C35.67,41.89 35.65,42.11 35.65,42.36V43.25C35.65,43.45 35.66,43.63 35.69,43.79C35.71,43.94 35.75,44.08 35.8,44.19C35.84,44.31 35.9,44.4 35.97,44.47C36.04,44.54 36.12,44.6 36.21,44.63C36.3,44.67 36.4,44.68 36.51,44.68C36.65,44.68 36.78,44.66 36.88,44.6C36.99,44.55 37.08,44.46 37.15,44.35C37.22,44.23 37.28,44.08 37.31,43.9C37.35,43.72 37.37,43.5 37.37,43.25Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M30.93,55.67H30.98C31.32,55.67 31.59,55.62 31.8,55.53C32.01,55.44 32.17,55.31 32.28,55.15C32.39,54.99 32.47,54.82 32.51,54.62C32.55,54.42 32.57,54.21 32.57,54V53.31C32.57,53.1 32.55,52.92 32.5,52.76C32.45,52.6 32.39,52.46 32.31,52.35C32.23,52.24 32.13,52.16 32.03,52.11C31.92,52.05 31.81,52.02 31.7,52.02C31.56,52.02 31.44,52.05 31.34,52.1C31.23,52.15 31.14,52.23 31.07,52.32C31,52.42 30.95,52.53 30.91,52.66C30.87,52.79 30.85,52.93 30.85,53.08C30.85,53.22 30.87,53.35 30.9,53.48C30.94,53.6 30.99,53.72 31.06,53.82C31.13,53.92 31.21,54 31.31,54.07C31.42,54.12 31.54,54.15 31.68,54.15C31.81,54.15 31.93,54.13 32.04,54.08C32.16,54.03 32.26,53.96 32.34,53.87C32.43,53.78 32.5,53.68 32.56,53.57C32.61,53.45 32.64,53.34 32.65,53.21H32.93C32.93,53.39 32.89,53.56 32.82,53.72C32.76,53.89 32.66,54.04 32.54,54.18C32.42,54.32 32.28,54.43 32.12,54.51C31.95,54.59 31.78,54.63 31.58,54.63C31.36,54.63 31.16,54.59 31,54.5C30.84,54.42 30.7,54.3 30.59,54.15C30.49,54.01 30.41,53.84 30.36,53.67C30.31,53.48 30.28,53.3 30.28,53.12C30.28,52.9 30.31,52.7 30.38,52.51C30.44,52.32 30.53,52.15 30.64,52.01C30.76,51.86 30.91,51.75 31.08,51.67C31.26,51.58 31.47,51.54 31.7,51.54C31.96,51.54 32.18,51.6 32.36,51.7C32.55,51.8 32.69,51.94 32.81,52.12C32.93,52.29 33.01,52.49 33.07,52.71C33.12,52.93 33.15,53.15 33.15,53.38V53.59C33.15,53.83 33.13,54.07 33.1,54.31C33.07,54.55 33.01,54.79 32.93,55.01C32.84,55.23 32.72,55.42 32.56,55.6C32.4,55.77 32.19,55.91 31.93,56.01C31.68,56.11 31.36,56.16 30.98,56.16H30.93V55.67Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M36.18,66.15C36.18,66.43 36.12,66.66 35.99,66.86C35.86,67.05 35.69,67.19 35.47,67.29C35.25,67.39 35.01,67.44 34.74,67.44C34.46,67.44 34.22,67.39 34,67.29C33.78,67.19 33.61,67.05 33.48,66.86C33.35,66.66 33.29,66.43 33.29,66.15C33.29,65.97 33.32,65.8 33.39,65.65C33.46,65.5 33.56,65.37 33.69,65.25C33.82,65.14 33.97,65.06 34.15,65C34.32,64.93 34.52,64.9 34.73,64.9C35.01,64.9 35.26,64.96 35.48,65.06C35.7,65.17 35.87,65.32 35.99,65.5C36.12,65.69 36.18,65.91 36.18,66.15ZM35.6,66.14C35.6,65.97 35.57,65.82 35.49,65.69C35.42,65.56 35.32,65.46 35.19,65.38C35.05,65.31 34.9,65.27 34.73,65.27C34.55,65.27 34.4,65.31 34.27,65.38C34.14,65.46 34.04,65.56 33.97,65.69C33.9,65.82 33.87,65.97 33.87,66.14C33.87,66.31 33.9,66.46 33.97,66.59C34.04,66.71 34.14,66.8 34.27,66.87C34.4,66.94 34.56,66.97 34.74,66.97C34.92,66.97 35.07,66.94 35.2,66.87C35.33,66.8 35.43,66.71 35.5,66.59C35.57,66.46 35.6,66.31 35.6,66.14ZM36.08,64.01C36.08,64.24 36.02,64.43 35.9,64.61C35.78,64.79 35.63,64.93 35.42,65.03C35.22,65.13 34.99,65.18 34.74,65.18C34.48,65.18 34.24,65.13 34.04,65.03C33.84,64.93 33.68,64.79 33.56,64.61C33.45,64.43 33.39,64.24 33.39,64.01C33.39,63.75 33.45,63.52 33.56,63.34C33.68,63.15 33.84,63.01 34.04,62.91C34.24,62.82 34.47,62.77 34.73,62.77C34.99,62.77 35.22,62.82 35.43,62.91C35.63,63.01 35.79,63.15 35.9,63.34C36.02,63.52 36.08,63.75 36.08,64.01ZM35.5,64.02C35.5,63.87 35.47,63.74 35.4,63.62C35.34,63.5 35.25,63.41 35.13,63.35C35.02,63.28 34.88,63.24 34.73,63.24C34.58,63.24 34.45,63.27 34.33,63.34C34.22,63.4 34.13,63.49 34.07,63.61C34,63.72 33.97,63.86 33.97,64.02C33.97,64.18 34,64.32 34.07,64.43C34.13,64.55 34.22,64.64 34.34,64.71C34.45,64.77 34.58,64.8 34.74,64.8C34.89,64.8 35.02,64.77 35.13,64.71C35.25,64.64 35.34,64.55 35.4,64.43C35.47,64.32 35.5,64.18 35.5,64.02Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M44.82,71.49V71.82L42.94,76.04H42.33L44.21,71.96H41.75V71.49H44.82Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M55.43,74.35H55.48V74.84H55.43C55.12,74.84 54.87,74.89 54.66,74.99C54.45,75.09 54.29,75.22 54.17,75.39C54.05,75.55 53.96,75.74 53.91,75.94C53.85,76.15 53.83,76.36 53.83,76.57V77.24C53.83,77.44 53.85,77.62 53.9,77.78C53.95,77.93 54.01,78.06 54.1,78.17C54.18,78.27 54.27,78.35 54.38,78.41C54.49,78.46 54.6,78.49 54.71,78.49C54.84,78.49 54.96,78.46 55.07,78.41C55.17,78.36 55.26,78.29 55.33,78.2C55.4,78.1 55.46,77.99 55.49,77.87C55.53,77.74 55.55,77.6 55.55,77.45C55.55,77.31 55.53,77.18 55.5,77.06C55.47,76.93 55.42,76.82 55.35,76.72C55.28,76.62 55.19,76.54 55.09,76.49C54.99,76.43 54.86,76.4 54.72,76.4C54.56,76.4 54.41,76.44 54.27,76.52C54.14,76.59 54.02,76.7 53.93,76.82C53.84,76.95 53.79,77.08 53.78,77.23L53.48,77.23C53.5,77 53.56,76.8 53.64,76.63C53.72,76.47 53.82,76.33 53.94,76.23C54.06,76.12 54.19,76.04 54.34,75.99C54.49,75.94 54.65,75.92 54.82,75.92C55.04,75.92 55.24,75.96 55.4,76.05C55.57,76.13 55.7,76.25 55.81,76.39C55.92,76.53 55.99,76.69 56.04,76.87C56.1,77.05 56.12,77.23 56.12,77.42C56.12,77.63 56.09,77.84 56.03,78.02C55.97,78.21 55.88,78.37 55.76,78.52C55.64,78.66 55.49,78.77 55.32,78.85C55.14,78.93 54.94,78.97 54.71,78.97C54.46,78.97 54.25,78.92 54.07,78.82C53.88,78.71 53.73,78.58 53.61,78.41C53.49,78.24 53.4,78.05 53.34,77.85C53.28,77.64 53.25,77.43 53.25,77.22V76.95C53.25,76.63 53.28,76.31 53.34,76C53.41,75.7 53.52,75.42 53.68,75.17C53.84,74.92 54.06,74.72 54.34,74.57C54.63,74.42 54.99,74.35 55.43,74.35Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M65.01,73.87L64.55,73.76L64.78,71.49H67.11V72.02H65.27L65.13,73.26C65.21,73.21 65.32,73.17 65.44,73.13C65.57,73.09 65.72,73.07 65.89,73.07C66.1,73.07 66.29,73.1 66.45,73.17C66.62,73.25 66.76,73.35 66.88,73.48C67,73.61 67.09,73.77 67.15,73.96C67.21,74.15 67.24,74.36 67.24,74.59C67.24,74.81 67.21,75.01 67.15,75.19C67.09,75.38 67.01,75.54 66.89,75.67C66.77,75.81 66.62,75.92 66.44,75.99C66.26,76.07 66.05,76.1 65.8,76.1C65.62,76.1 65.45,76.08 65.28,76.03C65.12,75.98 64.97,75.9 64.84,75.79C64.72,75.69 64.61,75.56 64.53,75.4C64.45,75.24 64.4,75.06 64.38,74.84H64.93C64.96,75.01 65.01,75.16 65.08,75.27C65.16,75.39 65.25,75.48 65.38,75.54C65.5,75.6 65.64,75.63 65.8,75.63C65.94,75.63 66.06,75.6 66.17,75.56C66.28,75.51 66.36,75.44 66.44,75.35C66.51,75.26 66.57,75.15 66.6,75.02C66.64,74.9 66.66,74.75 66.66,74.6C66.66,74.45 66.64,74.32 66.6,74.2C66.56,74.07 66.5,73.97 66.43,73.87C66.35,73.78 66.25,73.71 66.14,73.66C66.03,73.61 65.9,73.58 65.75,73.58C65.56,73.58 65.41,73.61 65.31,73.66C65.21,73.71 65.11,73.78 65.01,73.87Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M75.91,65.85V66.32H72.62V65.98L74.66,62.83H75.13L74.62,63.74L73.27,65.85H75.91ZM75.27,62.83V67.38H74.69V62.83H75.27Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M76.36,53.6H76.77C76.98,53.6 77.14,53.56 77.27,53.5C77.41,53.43 77.51,53.34 77.57,53.22C77.64,53.1 77.67,52.97 77.67,52.82C77.67,52.64 77.64,52.5 77.58,52.38C77.53,52.26 77.44,52.17 77.32,52.11C77.2,52.05 77.06,52.02 76.88,52.02C76.71,52.02 76.57,52.05 76.45,52.12C76.32,52.18 76.23,52.27 76.16,52.38C76.09,52.5 76.05,52.64 76.05,52.8H75.47C75.47,52.57 75.53,52.35 75.65,52.17C75.77,51.98 75.93,51.82 76.14,51.71C76.35,51.6 76.6,51.54 76.88,51.54C77.15,51.54 77.39,51.59 77.6,51.69C77.81,51.79 77.97,51.93 78.08,52.12C78.2,52.31 78.25,52.55 78.25,52.83C78.25,52.95 78.23,53.07 78.17,53.2C78.12,53.33 78.04,53.45 77.92,53.56C77.81,53.67 77.67,53.77 77.49,53.84C77.32,53.91 77.1,53.95 76.86,53.95H76.36V53.6ZM76.36,54.07V53.72H76.86C77.15,53.72 77.38,53.76 77.57,53.83C77.76,53.9 77.91,53.99 78.02,54.1C78.13,54.22 78.21,54.34 78.25,54.48C78.3,54.62 78.32,54.75 78.32,54.89C78.32,55.1 78.28,55.29 78.21,55.45C78.14,55.62 78.04,55.76 77.91,55.87C77.78,55.99 77.63,56.07 77.45,56.13C77.28,56.19 77.09,56.22 76.88,56.22C76.68,56.22 76.5,56.19 76.32,56.13C76.15,56.08 76,56 75.86,55.89C75.73,55.78 75.62,55.65 75.55,55.49C75.47,55.34 75.44,55.15 75.44,54.95H76.01C76.01,55.11 76.05,55.25 76.12,55.37C76.19,55.49 76.29,55.58 76.42,55.65C76.55,55.71 76.7,55.74 76.88,55.74C77.06,55.74 77.21,55.71 77.34,55.65C77.47,55.59 77.57,55.5 77.63,55.37C77.7,55.25 77.74,55.09 77.74,54.9C77.74,54.71 77.7,54.55 77.62,54.43C77.54,54.31 77.43,54.22 77.28,54.16C77.14,54.1 76.97,54.07 76.77,54.07H76.36Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M75.81,44.62V45.1H72.83V44.68L74.32,43.02C74.51,42.82 74.65,42.64 74.75,42.5C74.85,42.36 74.92,42.23 74.96,42.12C75,42 75.02,41.89 75.02,41.77C75.02,41.62 74.99,41.48 74.93,41.36C74.87,41.24 74.78,41.14 74.66,41.07C74.54,40.99 74.4,40.96 74.23,40.96C74.03,40.96 73.86,41 73.72,41.08C73.59,41.15 73.49,41.26 73.42,41.4C73.36,41.54 73.32,41.7 73.32,41.88H72.75C72.75,41.63 72.8,41.39 72.91,41.18C73.03,40.97 73.19,40.8 73.41,40.67C73.64,40.55 73.91,40.48 74.23,40.48C74.52,40.48 74.76,40.53 74.97,40.64C75.17,40.74 75.33,40.88 75.44,41.06C75.55,41.24 75.6,41.46 75.6,41.7C75.6,41.83 75.58,41.97 75.53,42.11C75.49,42.24 75.43,42.38 75.35,42.51C75.27,42.65 75.18,42.78 75.08,42.91C74.97,43.04 74.87,43.17 74.75,43.3L73.53,44.62H75.81Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M66.18,31.86V36.44H65.6V32.59L64.43,33.01V32.49L66.09,31.86H66.18Z"
+      android:fillColor="#333333"/>
+</vector>
diff --git a/res/drawable/e_clock.xml b/res/drawable/e_clock.xml
new file mode 100644
index 000000000..8fa21ddb0
--- /dev/null
+++ b/res/drawable/e_clock.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <background android:drawable="@drawable/e_backgroundclock" />
+
+    <foreground>
+        <layer-list>
+            <!-- Hour hand -->
+            <item android:drawable="@drawable/e_hourclock" />
+                <!-- Minute hand -->
+            <item android:drawable="@drawable/e_minuteclock" />
+            <!--
+            Second hand
+            -->
+            <item android:drawable="@drawable/e_secondclock" />
+        </layer-list>
+    </foreground>
+    <monochrome>
+        <layer-list>
+            <item>
+                <!--
+                Hour hand
+                -->
+                <rotate
+                    android:fromDegrees="310.0"
+                    android:pivotX="50.0%"
+                    android:pivotY="50.0%"
+                    android:toDegrees="5310.0">
+                    <vector
+                        android:width="108.0dp"
+                        android:height="108.0dp"
+                        android:viewportWidth="108.0"
+                        android:viewportHeight="108.0">
+                        <path
+                            android:fillColor="@android:color/white"
+                            android:pathData="M53.9998 35C53.4334 35 52.9605 35.4318 52.9092 35.9959L52.0718 45.2071C53.3459 44.9289 54.6633 44.9322 55.9278 45.2085L55.0903 35.9959C55.039 35.4318 54.5661 35 53.9998 35Z" />
+                    </vector>
+                </rotate>
+            </item>
+            <item>
+                <!--
+                Minute hand
+                -->
+                <rotate
+                    android:fromDegrees="50.0"
+                    android:pivotX="50.0%"
+                    android:pivotY="50.0%"
+                    android:toDegrees="60050.0">
+                    <vector
+                        android:width="108.0dp"
+                        android:height="108.0dp"
+                        android:viewportWidth="108.0"
+                        android:viewportHeight="108.0">
+                        <path
+                            android:fillColor="@android:color/white"
+                            android:pathData="M54.0002 29.0002C53.4368 29.0002 52.9691 29.4356 52.929 29.9976L51.8386 45.2629C53.2509 44.9147 54.7373 44.9103 56.1617 45.2615L55.0714 29.9976C55.0313 29.4356 54.5636 29.0002 54.0002 29.0002Z" />
+                    </vector>
+                </rotate>
+            </item>
+            <item>
+                <!--
+                Second hand
+                -->
+                <rotate
+                    android:fromDegrees="180.0"
+                    android:pivotX="50.0%"
+                    android:pivotY="50.0%"
+                    android:toDegrees="6180.0">
+                    <vector
+                        android:width="108.0dp"
+                        android:height="108.0dp"
+                        android:viewportWidth="108.0"
+                        android:viewportHeight="108.0">
+                        <path
+                            android:fillColor="@android:color/white"
+                            android:pathData="M53 45.0552C53.3283 45.0189 53.662 45.0002 54 45.0002C54.338 45.0002 54.6717 45.0189 55 45.0552L55 32.0002C55 31.448 54.5523 31.0002 54 31.0002C53.4477 31.0002 53 31.448 53 32.0002L53 45.0552Z" />
+                    </vector>
+                </rotate>
+            </item>
+            <item>
+                <!--
+                Center
+                -->
+                <vector
+                    android:width="108.0dp"
+                    android:height="108.0dp"
+                    android:viewportWidth="108.0"
+                    android:viewportHeight="108.0">
+                    <path
+                        android:fillColor="@android:color/white"
+                        android:pathData="M60 54C60 57.3137 57.3137 60 54 60C50.6863 60 48 57.3137 48 54C48 50.6863 50.6863 48 54 48C57.3137 48 60 50.6863 60 54Z" />
+                </vector>
+            </item>
+        </layer-list>
+    </monochrome>
+</adaptive-icon>
diff --git a/res/drawable/e_hourclock.xml b/res/drawable/e_hourclock.xml
new file mode 100644
index 000000000..471072d2d
--- /dev/null
+++ b/res/drawable/e_hourclock.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromDegrees="300.0"
+    android:pivotX="50.0%"
+    android:pivotY="50.0%"
+    android:toDegrees="5300.0">
+
+    <vector
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="108"
+        android:viewportHeight="108">
+        <path
+            android:fillColor="#000000"
+            android:pathData="M54.17,53.5L54.17,53.5A0.5,0.5 0,0 1,54.67 54L54.67,54A0.5,0.5 0,0 1,54.17 54.5L54.17,54.5A0.5,0.5 0,0 1,53.67 54L53.67,54A0.5,0.5 0,0 1,54.17 53.5z" />
+        <path
+            android:fillColor="#000000"
+            android:pathData="M53.77,38.63h0.8v16.82h-0.8z" />
+    </vector>
+</rotate>
diff --git a/res/drawable/e_minuteclock.xml b/res/drawable/e_minuteclock.xml
new file mode 100644
index 000000000..2f21ec655
--- /dev/null
+++ b/res/drawable/e_minuteclock.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromDegrees="60.0"
+    android:pivotX="50.0%"
+    android:pivotY="50.0%"
+    android:toDegrees="60060.0">
+
+    <vector
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="108"
+        android:viewportHeight="108">
+      <path
+          android:pathData="M53.93,31.63h0.8v23.83h-0.8z"
+          android:fillColor="#000000"/>
+        <path
+            android:fillColor="#000000"
+            android:pathData="M54,53.5L54,53.5A0.5,0.5 0,0 1,54.5 54L54.5,54A0.5,0.5 0,0 1,54 54.5L54,54.5A0.5,0.5 0,0 1,53.5 54L53.5,54A0.5,0.5 0,0 1,54 53.5z" />
+    </vector>
+</rotate>
diff --git a/res/drawable/e_secondclock.xml b/res/drawable/e_secondclock.xml
new file mode 100644
index 000000000..dfdb49f08
--- /dev/null
+++ b/res/drawable/e_secondclock.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromDegrees="180.0"
+    android:pivotX="50.0%"
+    android:pivotY="50.0%"
+    android:toDegrees="6180.0">
+
+    <vector
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="108"
+        android:viewportHeight="108">
+        <path
+            android:pathData="M53.8,28.38h0.4v27.13h-0.4z"
+            android:fillColor="#FF0000"/>
+        <path
+            android:pathData="M54,54m-0.75,0a0.75,0.75 0,1 1,1.5 0a0.75,0.75 0,1 1,-1.5 0"
+            android:fillColor="#000000"/>
+    </vector>
+</rotate>
diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml
index 8bb038e44..46be0492a 100644
--- a/res/drawable/ic_launcher_background.xml
+++ b/res/drawable/ic_launcher_background.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"
@@ -10,14 +21,5 @@
     android:viewportHeight="108">
   <path
       android:pathData="M0,0h108v108h-108z"
-      android:fillColor="#2A3232"/>
-  <path
-      android:pathData="M37.147,39.859C36.783,40.292 36.81,40.932 37.209,41.334L49.958,54.17C49.973,54.186 49.989,54.201 50.006,54.217C50.002,54.145 50,54.073 50,54C50,51.953 51.537,50.266 53.52,50.028C53.502,50.015 53.484,50.002 53.465,49.989L38.611,39.663C38.146,39.34 37.511,39.425 37.147,39.859Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M75.449,36.002C75.087,35.57 74.453,35.492 73.997,35.822L54.501,49.942C54.466,49.967 54.432,49.993 54.399,50.02C56.421,50.22 58,51.925 58,54C58,54.1 57.996,54.2 57.989,54.298C58.021,54.27 58.052,54.241 58.083,54.211L75.374,37.464C75.779,37.071 75.812,36.433 75.449,36.002Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M54,54m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#98A7A7"/>
+      android:fillColor="#225180"/>
 </vector>
diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml
index 5f494b6ee..bcb861172 100644
--- a/res/drawable/ic_launcher_foreground.xml
+++ b/res/drawable/ic_launcher_foreground.xml
@@ -1,39 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group>
-    <clip-path
-        android:pathData="M0,0h108v108h-108z"/>
-    <path
-        android:pathData="M54,79L54,54"
-        android:strokeWidth="2"
-        android:fillColor="#00000000"
-        android:strokeColor="#FFD250"
-        android:strokeLineCap="round"/>
-    <path
-        android:pathData="M54,54m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
-        android:fillColor="#F09F38"/>
-    <path
-        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
-        android:fillAlpha="0.6">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:gradientRadius="72"
-            android:centerX="28.54"
-            android:centerY="28.54"
-            android:type="radial">
-          <item android:offset="0" android:color="#19FFFFFF"/>
-          <item android:offset="1" android:color="#00FFFFFF"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
+  <path
+      android:pathData="M54,80C68.36,80 80,68.36 80,54C80,39.64 68.36,28 54,28C39.64,28 28,39.64 28,54C28,68.36 39.64,80 54,80Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="54"
+          android:startY="52.96"
+          android:endX="54"
+          android:endY="106.51"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#FFCBD6EA"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M52.74,35.27H52.21V31.74L51.14,32.13V31.65L52.66,31.08H52.74V35.27Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M57.03,35.27H54.29V34.89L55.74,33.28C55.95,33.04 56.1,32.84 56.18,32.69C56.26,32.54 56.3,32.38 56.3,32.22C56.3,32 56.24,31.82 56.1,31.68C55.97,31.55 55.8,31.48 55.58,31.48C55.31,31.48 55.11,31.55 54.96,31.7C54.82,31.85 54.74,32.06 54.74,32.33H54.21C54.21,31.94 54.34,31.63 54.58,31.4C54.83,31.16 55.16,31.04 55.58,31.04C55.96,31.04 56.27,31.14 56.5,31.35C56.72,31.55 56.83,31.82 56.83,32.16C56.83,32.57 56.57,33.06 56.05,33.62L54.93,34.84H57.03V35.27Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M42.42,38.12H41.89V34.58L40.82,34.97V34.49L42.34,33.92H42.42V38.12Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M45.71,38.12H45.18V34.58L44.11,34.97V34.49L45.63,33.92H45.71V38.12Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M34.64,45.84H34.11V42.3L33.04,42.7V42.21L34.56,41.64H34.64V45.84Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M38.81,44.06C38.81,44.68 38.71,45.14 38.5,45.44C38.28,45.74 37.95,45.89 37.5,45.89C37.06,45.89 36.73,45.75 36.51,45.45C36.3,45.16 36.19,44.71 36.18,44.13V43.42C36.18,42.81 36.29,42.35 36.5,42.05C36.71,41.76 37.04,41.61 37.5,41.61C37.94,41.61 38.27,41.75 38.49,42.04C38.7,42.33 38.81,42.77 38.81,43.37V44.06ZM38.28,43.33C38.28,42.88 38.22,42.56 38.09,42.35C37.97,42.15 37.77,42.04 37.5,42.04C37.22,42.04 37.03,42.14 36.9,42.35C36.78,42.55 36.71,42.87 36.71,43.29V44.14C36.71,44.59 36.77,44.92 36.9,45.14C37.04,45.35 37.24,45.46 37.5,45.46C37.76,45.46 37.96,45.36 38.08,45.16C38.21,44.95 38.28,44.64 38.28,44.2V43.33Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M33.89,54.14C33.78,54.27 33.64,54.38 33.49,54.46C33.34,54.54 33.17,54.58 32.99,54.58C32.74,54.58 32.53,54.52 32.36,54.4C32.18,54.29 32.04,54.12 31.94,53.91C31.85,53.69 31.8,53.45 31.8,53.19C31.8,52.91 31.85,52.66 31.95,52.44C32.06,52.21 32.21,52.04 32.41,51.93C32.6,51.81 32.83,51.75 33.09,51.75C33.5,51.75 33.83,51.9 34.06,52.21C34.3,52.52 34.42,52.94 34.42,53.47V53.63C34.42,54.44 34.26,55.03 33.94,55.41C33.62,55.78 33.13,55.97 32.49,55.98H32.38V55.53H32.5C32.93,55.53 33.27,55.41 33.5,55.19C33.74,54.97 33.87,54.62 33.89,54.14ZM33.07,54.14C33.25,54.14 33.41,54.09 33.56,53.98C33.71,53.87 33.82,53.74 33.89,53.58V53.36C33.89,53.02 33.82,52.73 33.66,52.52C33.51,52.3 33.32,52.19 33.09,52.19C32.86,52.19 32.67,52.28 32.53,52.46C32.39,52.64 32.32,52.87 32.32,53.16C32.32,53.45 32.39,53.68 32.52,53.87C32.66,54.05 32.84,54.14 33.07,54.14Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M37.1,63.19C37.1,63.39 37.05,63.58 36.94,63.74C36.83,63.9 36.68,64.03 36.49,64.12C36.71,64.22 36.88,64.35 37.01,64.53C37.14,64.71 37.2,64.91 37.2,65.14C37.2,65.5 37.08,65.79 36.83,66C36.59,66.22 36.27,66.33 35.88,66.33C35.47,66.33 35.15,66.22 34.91,66C34.67,65.79 34.55,65.5 34.55,65.14C34.55,64.92 34.61,64.71 34.73,64.53C34.86,64.35 35.03,64.21 35.24,64.12C35.06,64.03 34.91,63.9 34.81,63.74C34.7,63.58 34.65,63.39 34.65,63.19C34.65,62.83 34.76,62.55 34.98,62.35C35.21,62.14 35.51,62.04 35.88,62.04C36.24,62.04 36.54,62.14 36.76,62.35C36.99,62.55 37.1,62.83 37.1,63.19ZM36.67,65.13C36.67,64.9 36.6,64.71 36.45,64.56C36.3,64.41 36.11,64.34 35.87,64.34C35.63,64.34 35.44,64.41 35.29,64.56C35.15,64.7 35.08,64.89 35.08,65.13C35.08,65.37 35.15,65.55 35.29,65.69C35.43,65.83 35.62,65.89 35.88,65.89C36.12,65.89 36.32,65.83 36.46,65.69C36.6,65.55 36.67,65.37 36.67,65.13ZM35.88,62.47C35.67,62.47 35.5,62.54 35.37,62.67C35.24,62.8 35.18,62.97 35.18,63.19C35.18,63.41 35.24,63.58 35.37,63.71C35.49,63.84 35.66,63.9 35.88,63.9C36.09,63.9 36.26,63.84 36.38,63.71C36.51,63.58 36.57,63.41 36.57,63.19C36.57,62.98 36.51,62.81 36.38,62.68C36.24,62.54 36.08,62.47 35.88,62.47Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M45.12,70.33L43.4,74.21H42.84L44.56,70.47H42.3V70.04H45.12V70.33Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M54.9,72.66V73.11H54.8C54.39,73.12 54.06,73.24 53.81,73.48C53.57,73.71 53.43,74.05 53.39,74.48C53.61,74.22 53.91,74.1 54.29,74.1C54.65,74.1 54.94,74.23 55.16,74.48C55.38,74.74 55.48,75.07 55.48,75.47C55.48,75.9 55.37,76.25 55.13,76.51C54.9,76.76 54.59,76.89 54.19,76.89C53.79,76.89 53.47,76.74 53.22,76.43C52.97,76.13 52.85,75.73 52.85,75.25V75.04C52.85,74.28 53.01,73.69 53.34,73.28C53.67,72.88 54.16,72.67 54.8,72.66H54.9ZM54.2,74.54C54.02,74.54 53.85,74.59 53.7,74.7C53.55,74.81 53.44,74.95 53.38,75.11V75.31C53.38,75.65 53.46,75.93 53.61,76.14C53.77,76.35 53.96,76.45 54.19,76.45C54.43,76.45 54.62,76.37 54.75,76.19C54.89,76.01 54.96,75.78 54.96,75.5C54.96,75.21 54.89,74.98 54.75,74.81C54.61,74.63 54.43,74.54 54.2,74.54Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M63.21,72.12L63.42,70.04H65.56V70.53H63.87L63.74,71.66C63.95,71.54 64.18,71.48 64.44,71.48C64.82,71.48 65.12,71.61 65.35,71.86C65.57,72.11 65.68,72.45 65.68,72.88C65.68,73.31 65.57,73.65 65.33,73.9C65.1,74.14 64.78,74.27 64.36,74.27C63.99,74.27 63.69,74.16 63.46,73.96C63.23,73.75 63.09,73.47 63.06,73.11H63.56C63.59,73.35 63.68,73.53 63.82,73.65C63.95,73.77 64.14,73.83 64.36,73.83C64.61,73.83 64.8,73.75 64.94,73.58C65.08,73.41 65.15,73.18 65.15,72.88C65.15,72.61 65.08,72.38 64.92,72.21C64.77,72.04 64.57,71.96 64.32,71.96C64.09,71.96 63.91,72.01 63.77,72.11L63.63,72.23L63.21,72.12Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M73.04,64.87H73.62V65.3H73.04V66.27H72.51V65.3H70.61V64.99L72.48,62.1H73.04V64.87ZM71.21,64.87H72.51V62.82L72.45,62.94L71.21,64.87Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M74.04,53.63H74.44C74.69,53.63 74.89,53.56 75.03,53.44C75.17,53.31 75.25,53.13 75.25,52.92C75.25,52.43 75,52.18 74.52,52.18C74.29,52.18 74.1,52.25 73.97,52.38C73.83,52.51 73.76,52.68 73.76,52.9H73.23C73.23,52.57 73.35,52.29 73.59,52.08C73.84,51.86 74.14,51.75 74.52,51.75C74.91,51.75 75.22,51.85 75.44,52.06C75.66,52.27 75.78,52.56 75.78,52.93C75.78,53.11 75.72,53.29 75.6,53.46C75.48,53.63 75.32,53.75 75.12,53.84C75.35,53.91 75.53,54.03 75.65,54.2C75.78,54.37 75.84,54.57 75.84,54.81C75.84,55.19 75.72,55.48 75.47,55.7C75.23,55.92 74.91,56.03 74.52,56.03C74.13,56.03 73.81,55.93 73.56,55.72C73.32,55.5 73.19,55.22 73.19,54.88H73.73C73.73,55.1 73.8,55.27 73.94,55.4C74.09,55.54 74.28,55.6 74.52,55.6C74.77,55.6 74.97,55.53 75.11,55.4C75.24,55.27 75.31,55.08 75.31,54.82C75.31,54.58 75.23,54.4 75.09,54.27C74.94,54.14 74.72,54.07 74.44,54.07H74.04V53.63Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M73.54,45.84H70.81V45.45L72.25,43.85C72.47,43.61 72.61,43.41 72.69,43.26C72.77,43.11 72.82,42.95 72.82,42.79C72.82,42.57 72.75,42.39 72.62,42.25C72.49,42.11 72.31,42.04 72.09,42.04C71.83,42.04 71.62,42.12 71.47,42.27C71.33,42.42 71.26,42.63 71.26,42.89H70.73C70.73,42.51 70.85,42.2 71.1,41.96C71.34,41.72 71.68,41.61 72.09,41.61C72.48,41.61 72.79,41.71 73.01,41.91C73.24,42.12 73.35,42.39 73.35,42.72C73.35,43.13 73.09,43.62 72.56,44.19L71.45,45.4H73.54V45.84Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M64.71,37.9H64.17V34.37L63.11,34.76V34.28L64.62,33.71H64.71V37.9Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M66.58,41.04L53.32,54.3"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#333333"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M68.66,68.74L53.38,53.46"
+      android:fillColor="#00000000"
+      android:strokeColor="#F83E54"/>
+  <path
+      android:pathData="M53.97,53.93H42.26"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#333333"/>
 </vector>
diff --git a/res/drawable/ic_launcher_monochrome.xml b/res/drawable/ic_launcher_monochrome.xml
deleted file mode 100644
index 3ac6a73c0..000000000
--- a/res/drawable/ic_launcher_monochrome.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M55,62.945C54.672,62.981 54.338,63 54,63C53.662,63 53.328,62.981 53,62.945V79C53,79.552 53.448,80 54,80C54.552,80 55,79.552 55,79V62.945Z"
-      android:fillColor="#ffffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M75.449,36.002C75.087,35.57 74.453,35.492 73.997,35.822L59.12,46.597C60.439,47.512 61.503,48.77 62.18,50.242L75.374,37.464C75.779,37.071 75.811,36.433 75.449,36.002Z"
-      android:fillColor="#ffffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M37.147,39.859C36.783,40.292 36.81,40.932 37.209,41.334L45.896,50.08C46.55,48.732 47.53,47.571 48.734,46.701L38.611,39.663C38.146,39.34 37.511,39.425 37.147,39.859Z"
-      android:fillColor="#ffffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M54,54m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
-      android:fillColor="#ffffffff"/>
-</vector>
diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml
index b58c81ff9..463b2ba98 100644
--- a/res/mipmap-anydpi/ic_launcher.xml
+++ b/res/mipmap-anydpi/ic_launcher.xml
@@ -1,10 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground> 
+        <inset android:drawable="@drawable/ic_launcher_foreground" android:inset="5%" />
+    </foreground>
 </adaptive-icon>
-- 
GitLab


From d7d387cf04359156753b0b1d746de7c845a9fda1 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Thu, 15 Sep 2022 19:15:36 +0530
Subject: [PATCH 2/4] Theme app according to our palette

---
 Android.bp                                    |  5 +++--
 res/color/checkbox_color.xml                  | 21 +++++++++++++++++++
 res/drawable/digit_background.xml             |  2 +-
 res/drawable/ic_caret_down.xml                |  2 +-
 res/drawable/ic_caret_up.xml                  |  2 +-
 res/drawable/popup_background.xml             |  2 +-
 res/layout-land/desk_clock.xml                |  4 ++--
 res/layout/city_list_item.xml                 |  3 ++-
 res/layout/collapsing_toolbar_base_layout.xml |  2 +-
 res/layout/desk_clock.xml                     |  4 ++--
 res/layout/timer_setup_digits.xml             |  2 --
 res/values/colors.xml                         | 18 ++++++++--------
 res/values/dimens.xml                         |  2 ++
 res/values/styles.xml                         | 14 ++++++-------
 res/values/themes.xml                         |  7 +++++--
 15 files changed, 58 insertions(+), 32 deletions(-)
 create mode 100644 res/color/checkbox_color.xml

diff --git a/Android.bp b/Android.bp
index ffafc993a..8ddec5502 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,7 +21,7 @@ android_app {
         "androidx.collection_collection",
         "androidx.arch.core_core-common",
         "androidx.lifecycle_lifecycle-common",
-        "com.google.android.material_material",
+        
         "androidx.lifecycle_lifecycle-runtime",
         "androidx.transition_transition",
         "androidx.core_core",
@@ -30,7 +30,8 @@ android_app {
         "androidx.appcompat_appcompat",
         "androidx.gridlayout_gridlayout",
         "androidx.recyclerview_recyclerview",
-        "androidx-constraintlayout_constraintlayout"
+        "androidx-constraintlayout_constraintlayout",
+        "elib",
     ],
     required: [
         "com.android.deskclock_allowlist",
diff --git a/res/color/checkbox_color.xml b/res/color/checkbox_color.xml
new file mode 100644
index 000000000..852841877
--- /dev/null
+++ b/res/color/checkbox_color.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/e_alpha_base_dark" android:alpha="0.38" />
+    <item android:state_checked="false" android:color="@color/e_alpha_base_dark" android:alpha="0.6" />
+    <item android:color="@color/e_accent_dark" />
+</selector>
diff --git a/res/drawable/digit_background.xml b/res/drawable/digit_background.xml
index 95d91de47..f276dad82 100644
--- a/res/drawable/digit_background.xml
+++ b/res/drawable/digit_background.xml
@@ -3,5 +3,5 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
 
-    <solid android:color="@color/default_background_lighter" />
+    <solid android:color="@android:color/transparent" />
 </shape>
diff --git a/res/drawable/ic_caret_down.xml b/res/drawable/ic_caret_down.xml
index a5c8e69ad..fa6581c45 100644
--- a/res/drawable/ic_caret_down.xml
+++ b/res/drawable/ic_caret_down.xml
@@ -22,7 +22,7 @@
         android:bottom="8dp">
         <shape android:shape="oval" >
             <size android:height="20dp" android:width="20dp" />
-            <solid android:color="@color/system_neutral2_500" />
+            <solid android:color="@android:color/transparent" />
         </shape>
     </item>
     <item>
diff --git a/res/drawable/ic_caret_up.xml b/res/drawable/ic_caret_up.xml
index 93a947407..f7285890f 100644
--- a/res/drawable/ic_caret_up.xml
+++ b/res/drawable/ic_caret_up.xml
@@ -22,7 +22,7 @@
         android:bottom="8dp">
         <shape android:shape="oval" >
             <size android:height="20dp" android:width="20dp" />
-            <solid android:color="@color/system_neutral2_500" />
+            <solid android:color="@android:color/transparent" />
         </shape>
     </item>
     <item>
diff --git a/res/drawable/popup_background.xml b/res/drawable/popup_background.xml
index 66ef3597c..9582aacd3 100644
--- a/res/drawable/popup_background.xml
+++ b/res/drawable/popup_background.xml
@@ -3,5 +3,5 @@
     android:shape="rectangle">
 
     <corners android:radius="28dp" />
-    <solid android:color="@color/system_neutral2_700" />
+    <solid android:color="@color/e_floating_background_dark" />
 </shape>
diff --git a/res/layout-land/desk_clock.xml b/res/layout-land/desk_clock.xml
index b8a121f3d..b77baf845 100644
--- a/res/layout-land/desk_clock.xml
+++ b/res/layout-land/desk_clock.xml
@@ -98,7 +98,7 @@
                 android:layout_margin="@dimen/fab_margin"
                 android:contentDescription="@null"
                 app:borderWidth="0dp"
-                app:fabCustomSize="@dimen/fab_height"
+                app:fabCustomSize="@dimen/fab_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -127,7 +127,7 @@
         android:id="@+id/bottom_view"
         android:layout_width="match_parent"
         android:layout_height="72dp"
-        android:background="@color/secondary_color"
+        android:background="@color/e_action_bar_dark"
         app:menu="@menu/bottom_navigation_menu"
         app:itemIconTint="@color/tab_tint_color"
         app:itemTextColor="@color/tab_tint_color"
diff --git a/res/layout/city_list_item.xml b/res/layout/city_list_item.xml
index 520ab328d..d79725180 100644
--- a/res/layout/city_list_item.xml
+++ b/res/layout/city_list_item.xml
@@ -34,7 +34,8 @@
         android:id="@+id/city_onoff"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:clickable="false" />
+        android:clickable="false"
+        android:buttonTint="@color/checkbox_color" />
     <TextView
         android:id="@+id/city_name"
         android:layout_width="0dip"
diff --git a/res/layout/collapsing_toolbar_base_layout.xml b/res/layout/collapsing_toolbar_base_layout.xml
index b07c5f074..4ac6ca717 100644
--- a/res/layout/collapsing_toolbar_base_layout.xml
+++ b/res/layout/collapsing_toolbar_base_layout.xml
@@ -39,7 +39,7 @@
             android:clipToPadding="false"
             app:forceApplySystemWindowInsetTop="true"
             app:extraMultilineHeightEnabled="true"
-            app:contentScrim="@android:color/system_neutral1_700"
+            app:contentScrim="@color/e_action_bar_dark"
             app:maxLines="3"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
             app:scrimAnimationDuration="50"
diff --git a/res/layout/desk_clock.xml b/res/layout/desk_clock.xml
index 7cad679b3..1a6c03b07 100644
--- a/res/layout/desk_clock.xml
+++ b/res/layout/desk_clock.xml
@@ -92,7 +92,7 @@
                 android:layout_gravity="center"
                 android:layout_margin="@dimen/fab_margin"
                 android:contentDescription="@null"
-                app:fabCustomSize="@dimen/fab_height"
+                app:fabCustomSize="@dimen/fab_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -117,7 +117,7 @@
         android:id="@+id/bottom_view"
         android:layout_width="match_parent"
         android:layout_height="80dp"
-        android:background="@color/secondary_color"
+        android:background="@color/e_action_bar_dark"
         android:paddingTop="12dp"
         android:paddingBottom="16dp"
         app:menu="@menu/bottom_navigation_menu"
diff --git a/res/layout/timer_setup_digits.xml b/res/layout/timer_setup_digits.xml
index c433eee34..a3054eca7 100644
--- a/res/layout/timer_setup_digits.xml
+++ b/res/layout/timer_setup_digits.xml
@@ -174,8 +174,6 @@
             android:scaleType="centerInside"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:backgroundTint="@color/accent_color2"
-            android:textColor="@color/secondary_color"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintStart_toEndOf="@id/column_1_right"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 91ca13873..9986a95d3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -33,30 +33,30 @@
 
     <color name="clock_gray">#B3FFFFFF</color>
 
-    <color name="default_background">@android:color/system_neutral1_900</color>
+    <color name="default_background">@color/e_background_dark</color>
 
     <!-- shadowColor for widget text -->
     <color name="widget_shadow_color">#000000</color>
 
-    <color name="accent_color">@android:color/system_accent3_200</color>
-    <color name="accent_color2">@android:color/system_accent2_200</color>
-    <color name="secondary_color">@android:color/system_neutral1_800</color>
-    <color name="default_background_lighter">@android:color/system_neutral2_800</color>
+    <color name="accent_color">@color/e_accent_dark</color>
+    <color name="accent_color2">@color/e_accent_dark</color>
+    <color name="secondary_color">@color/e_floating_background_dark</color>
+    <color name="default_background_lighter">@color/e_floating_background_dark</color>
 
     <!-- Material next state on color-->
-    <color name="state_on_color">@color/accent_100</color>
+    <color name="state_on_color">@color/e_switch_thumb_on</color>
 
     <!-- Material next thumb disable color-->
     <color name="thumb_disabled_color">@color/black</color>
 
     <!-- Material next thumb off color-->
-    <color name="thumb_off_color">@color/default_background</color>
+    <color name="thumb_off_color">@color/e_switch_thumb_off</color>
 
     <!-- Material next track on color-->
-    <color name="track_on_color">@color/accent_color</color>
+    <color name="track_on_color">@color/e_switch_track_on</color>
 
     <!-- Material next track off color-->
-    <color name="track_off_color">@color/system_neutral2_500</color>
+    <color name="track_off_color">@color/e_switch_track_off</color>
 
     <color name="system_neutral2_100">@android:color/system_neutral2_100</color>
     <color name="system_neutral2_300">@android:color/system_neutral2_300</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c136fe25a..4e3191e40 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -144,4 +144,6 @@
     <dimen name="settings_padding">4dp</dimen>
 
     <dimen name="analog_clock_width_percent">0.5</dimen>
+
+    <dimen name="fab_size">72dp</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8c6364344..733fea6e2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -109,7 +109,8 @@
         <item name="displayOptions">showTitle|homeAsUp</item>
     </style>
 
-    <style name="Widget.ActionBar.NoTitle">
+    <style name="Widget.ActionBar.NoTitle" parent="Widget.AppCompat.ActionBar">
+        <item name="background">@color/e_action_bar_dark</item>
         <!-- Attributes from androidx.appcompat.appcompat -->
         <item name="displayOptions">homeAsUp</item>
     </style>
@@ -135,8 +136,8 @@
 
     <style name="Widget.TimePicker" parent="android:Widget.Material.TimePicker">
         <item name="android:background">@color/default_background</item>
-        <item name="android:headerBackground">@color/system_neutral2_700</item>
-        <item name="android:numbersBackgroundColor">@color/system_neutral2_700</item>
+        <item name="android:headerBackground">@color/e_action_bar_dark</item>
+        <item name="android:numbersBackgroundColor">@color/e_floating_background_dark</item>
         <item name="android:numbersSelectorColor">?attr/colorAccent</item>
     </style>
 
@@ -152,10 +153,9 @@
     <style name="DeskClock.Switch" parent="@android:style/Widget.Material.CompoundButton.Switch">
         <item name="android:switchMinWidth">52dp</item>
         <item name="android:minHeight">@dimen/touch_target_min_size</item>
-        <item name="android:track">@drawable/switch_track</item>
-        <item name="track">@drawable/switch_track</item>
-        <item name="android:thumb">@drawable/switch_thumb</item>
-        <item name="thumbTint">@color/default_background</item>
+        <item name="android:track">@drawable/e_switch_track</item>
+        <item name="track">@drawable/e_switch_track</item>
+        <item name="android:thumb">@drawable/e_switch_thumb</item>
     </style>
 
     <style name="DeskClock.SwitchPreferenceCompat" parent="@style/Preference.SwitchPreferenceCompat.Material">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 08921baec..954d9b61b 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -19,7 +19,7 @@
 
     <style name="Theme.DeskClock" parent="Theme.AppCompat.NoActionBar">
         <item name="android:colorBackgroundFloating">?attr/colorBackgroundFloating</item>
-        <item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
+        <item name="android:navigationBarColor">@color/e_action_bar_dark</item>
         <item name="popupTheme">@style/ThemeOverlay.Popup</item>
 
         <item name="android:timePickerStyle">@style/Widget.TimePicker</item>
@@ -55,11 +55,14 @@
         <item name="switchPreferenceCompatStyle">@style/DeskClock.SwitchPreferenceCompat</item>
     </style>
 
-    <style name="Theme.DeskClock.CitySelection">
+    <style name="Theme.DeskClock.CitySelection" parent="Theme.AppCompat.NoActionBar">
         <!-- Attributes from androidx.appcompat.appcompat -->
         <item name="actionBarStyle">@style/Widget.ActionBar.NoTitle</item>
         <item name="windowActionBar">true</item>
         <item name="windowNoTitle">false</item>
+        <item name="colorAccent">@color/e_accent_dark</item>
+        <item name="android:statusBarColor">@color/e_action_bar_dark</item>
+        <item name="android:navigationBarColor">@color/e_action_bar_dark</item>
     </style>
 
     <style name="ThemeOverlay.Control.Accent" parent="ThemeOverlay.AppCompat">
-- 
GitLab


From 317efa863e2a6139f429c56a06ef41920460035f Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Wed, 19 Oct 2022 14:39:01 +0530
Subject: [PATCH 3/4] Fix timer text

---
 res/values-sw320dp/dimens.xml | 1 +
 res/values/dimens.xml         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/values-sw320dp/dimens.xml b/res/values-sw320dp/dimens.xml
index 724353acc..22bd64a8a 100644
--- a/res/values-sw320dp/dimens.xml
+++ b/res/values-sw320dp/dimens.xml
@@ -16,4 +16,5 @@
 
 <resources>
     <dimen name="big_font_size">60sp</dimen>
+    <dimen name="timer_setup_digit_font_size">60sp</dimen>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4e3191e40..ba12fb822 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -52,7 +52,7 @@
     <dimen name="day_button_font_size">16sp</dimen>
     <dimen name="alarm_info_font_size">36sp</dimen>
     <dimen name="no_alarm_font_size">16sp</dimen>
-    <dimen name="timer_setup_digit_font_size">72sp</dimen>
+    <dimen name="timer_setup_digit_font_size">66sp</dimen>
     <dimen name="timer_setup_top_size">120dip</dimen>
 
     <dimen name="alarm_picker_dialog_horizontal_margin">30dp</dimen>
-- 
GitLab


From 9076090137faa6efeba9cebb53cc486bf3fcd581 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Wed, 22 Mar 2023 16:50:19 +0530
Subject: [PATCH 4/4] Port translation changes from Android S

---
 res/values-de/strings.xml | 485 +++++++++++++++++----------------
 res/values-fr/strings.xml | 549 +++++++++++++++++++-------------------
 res/values-it/strings.xml | 416 +++++++++++++++--------------
 res/values-nl/strings.xml | 409 ++++++++++++++--------------
 res/values-ru/strings.xml | 497 +++++++++++++++++-----------------
 5 files changed, 1179 insertions(+), 1177 deletions(-)

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4242b7b59..4a34a7fd4 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- 
   Copyright (C) 2016 The Android Open Source Project
 
@@ -13,10 +13,7 @@
   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.
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+   --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="6674495003718166674">"Uhr"</string>
     <string name="label" msgid="162189613902857319">"Name"</string>
     <string name="default_label" msgid="5590025289805630372">"Wecker"</string>
@@ -40,141 +37,141 @@
     <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g>–<xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
     <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Schlummern"</string>
     <plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
-      <item quantity="one">1 min</item>
+        <item quantity="one">1 min</item>
+        <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> min</item>
     </plurals>
     <string name="alarm_alert_off_text" msgid="4472073417593915002">"Wecker aus"</string>
     <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Schlummern"</string>
     <plurals name="alarm_alert_snooze_set" formatted="false" msgid="3212729193036041768">
-      <item quantity="other">Schlummerfunktion für <xliff:g id="MINUTES">%d</xliff:g> Minuten aktiv</item>
-      <item quantity="one">Schlummerfunktion für 1 Minute aktiv</item>
+        <item quantity="one">Schlummerfunktion für 1 Minute aktiv</item>
+        <item quantity="other">Schlummerfunktion für <xliff:g id="minutes">%d</xliff:g> Minuten aktiv</item>
     </plurals>
     <string name="alarm_alert_snooze_until" msgid="6958013659168344550">"Schlummern bis <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="alarm_alert_predismiss_title" msgid="5723945586913705445">"Anstehender Weckruf"</string>
-    <string name="missed_alarm_has_been_deleted" msgid="5295473204045979335">"Der entgangene Weckruf wurde gelöscht."</string>
+    <string name="missed_alarm_has_been_deleted" msgid="5295473204045979335">Der entgangene Weckruf wurde gelöscht</string>
     <string name="timer_notifications_less_min" msgid="5481375048976427255">"Nur noch weniger als eine Minute"</string>
-    <string name="timer_notifications_hours" msgid="1613266446037145138">"<xliff:g id="REMAINING"> %3$s</xliff:g> <xliff:g id="HOURS">%1$s</xliff:g>"</string>
-    <string name="timer_notifications_minutes" msgid="8543138714519498893">"<xliff:g id="REMAINING"> %3$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g>"</string>
-    <string name="timer_notifications_hours_minutes" msgid="4788475350933275505">"Noch <xliff:g id="HOURS">%1$s</xliff:g>, <xliff:g id="MINUTES"> %2$s</xliff:g>"</string>
-    <string name="timer_notifications_seconds" msgid="122102514929728907">"<xliff:g id="SECONDS">%4$s</xliff:g><xliff:g id="REMAINING"> %3$s</xliff:g>"</string>
-    <string name="timer_notifications_minutes_seconds" msgid="7059651926379491350">"<xliff:g id="MINUTES">%2$s</xliff:g> <xliff:g id="SECONDS"> %4$s</xliff:g><xliff:g id="REMAINING"> %3$s</xliff:g>"</string>
-    <string name="timer_notifications_hours_seconds" msgid="8168090805113197804">"<xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="SECONDS"> %4$s</xliff:g><xliff:g id="REMAINING"> %3$s</xliff:g>"</string>
-    <string name="timer_notifications_hours_minutes_seconds" msgid="4666176878038730417">"<xliff:g id="HOURS">%1$s</xliff:g><xliff:g id="MINUTES"> %2$s</xliff:g><xliff:g id="SECONDS"> %4$s</xliff:g><xliff:g id="REMAINING"> %3$s</xliff:g>"</string>
-    <string name="timer_accessibility_one_minute_added" msgid="6096646178998456004">"Dem Timer wurde eine Minute hinzugefügt, <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="timer_accessibility_stopped" msgid="2753501043114605474">"Timer pausiert, <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="timer_accessibility_started" msgid="8503877052873671219">"Timer läuft, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="timer_notifications_hours" msgid="1613266446037145138"><xliff:g id="HOURS" example="2 hours">%1$s</xliff:g><xliff:g id="REMAINING" example="remaining"> %3$s</xliff:g></string>
+    <string name="timer_notifications_minutes" msgid="8543138714519498893"><xliff:g id="MINUTES" example="2 minutes">%2$s</xliff:g><xliff:g id="REMAINING" example="remaining"> %3$s</xliff:g></string>
+    <string name="timer_notifications_hours_minutes" msgid="4788475350933275505">Noch <xliff:g id="HOURS" example="2 hours">%1$s</xliff:g><xliff:g id="MINUTES" example="2 minutes"> %2$s</xliff:g> bleiben</string>
+    <string name="timer_notifications_seconds" msgid="122102514929728907"><xliff:g id="SECONDS" example="2 seconds">%4$s</xliff:g><xliff:g id="REMAINING" example="remaining"> %3$s</xliff:g></string>
+    <string name="timer_notifications_minutes_seconds" msgid="7059651926379491350"><xliff:g id="MINUTES" example="2 minutes">%2$s</xliff:g> <xliff:g id="SECONDS" example="2 seconds"> %4$s</xliff:g><xliff:g id="REMAINING" example="remaining"> %3$s</xliff:g></string>
+    <string name="timer_notifications_hours_seconds" msgid="8168090805113197804"><xliff:g id="HOURS" example="2 hours">%1$s</xliff:g> <xliff:g id="SECONDS" example="2 seconds"> %4$s</xliff:g><xliff:g id="REMAINING" example="remaining"> %3$s</xliff:g></string>
+    <string name="timer_notifications_hours_minutes_seconds" msgid="4666176878038730417"><xliff:g id="HOURS" example="2 hours">%1$s</xliff:g><xliff:g id="MINUTES" example="2 minutes"> %2$s</xliff:g><xliff:g id="SECONDS" example="2 seconds"> %4$s</xliff:g><xliff:g id="REMAINING" example="remaining"> %3$s</xliff:g></string>
+    <string name="timer_accessibility_one_minute_added" msgid="6096646178998456004">Eine Minute zum Timer hinzugefügt, <xliff:g id="TIME" example="5 hours remaining">%1$s</xliff:g></string>
+    <string name="timer_accessibility_stopped" msgid="2753501043114605474">Timer pausiert, <xliff:g id="TIME" example="5 hours remaining">%1$s</xliff:g></string>
+    <string name="timer_accessibility_started" msgid="8503877052873671219">Timer läuft, <xliff:g id="TIME" example="5 hours remaining">%1$s</xliff:g></string>
     <string name="timer_remaining_single" msgid="6782851171906765864">"Noch"</string>
     <string name="timer_remaining_multiple" msgid="6052775962092160851">"Noch"</string>
-  <string-array name="alarm_set">
-    <item msgid="6450913786084215050">"Der Wecker klingelt in weniger als einer Minute."</item>
-    <item msgid="6002066367368421848">"Der Wecker klingelt in <xliff:g id="DAYS">%1$s</xliff:g>."</item>
-    <item msgid="8824719306247973774">"Der Wecker klingelt in <xliff:g id="HOURS">%2$s</xliff:g>."</item>
-    <item msgid="8182406852935468862">"Der Wecker klingelt in <xliff:g id="DAYS">%1$s</xliff:g> und <xliff:g id="HOURS">%2$s</xliff:g>."</item>
-    <item msgid="2532279224777213194">"Der Wecker klingelt in <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
-    <item msgid="5936557894247187717">"Der Wecker klingelt in <xliff:g id="DAYS">%1$s</xliff:g> und <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
-    <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-array name="alarm_set">
+        <item msgid="6450913786084215050">"Der Wecker klingelt in weniger als einer Minute."</item>
+        <item msgid="6002066367368421848">"Der Wecker klingelt in <xliff:g id="DAYS">%1$s</xliff:g>."</item>
+        <item msgid="8824719306247973774">"Der Wecker klingelt in <xliff:g id="HOURS">%2$s</xliff:g>."</item>
+        <item msgid="8182406852935468862">"Der Wecker klingelt in <xliff:g id="DAYS">%1$s</xliff:g> und <xliff:g id="HOURS">%2$s</xliff:g>."</item>
+        <item msgid="2532279224777213194">"Der Wecker klingelt in <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
+        <item msgid="5936557894247187717">"Der Wecker klingelt in <xliff:g id="DAYS">%1$s</xliff:g> und <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
+        <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>
     <plurals name="days" formatted="false" msgid="3706846447285206235">
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> Tagen</item>
-      <item quantity="one">1 Tag</item>
+        <item quantity="one">1 Tag</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> Tage</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>
+        <item quantity="one">1 Stunde</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> Stunden</item>
     </plurals>
     <plurals name="hours_short" formatted="false" msgid="3709250715691092925">
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> h</item>
-      <item quantity="one">1 h</item>
+        <item quantity="one">1 h</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> h</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>
+        <item quantity="one">1 Minute</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> Minuten</item>
     </plurals>
     <plurals name="minutes_short" formatted="false" msgid="6397328304369080233">
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> min</item>
-      <item quantity="one">1 min</item>
+        <item quantity="one">1 min</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> min</item>
     </plurals>
     <plurals name="seconds" formatted="false" msgid="670343577734266047">
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> Sekunden</item>
-      <item quantity="one">1 Sekunde</item>
+        <item quantity="one">1 Sekunde</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> Sekunden</item>
     </plurals>
     <string name="every_day" msgid="4100909974923444602">"Täglich"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="loading_widget" msgid="5306242862476796500">"Wird geladen…"</string>
     <string name="analog_gadget" msgid="1670505720837152766">"Analoguhr"</string>
     <string name="digital_gadget" msgid="2326954556720571358">"Digitaluhr"</string>
-    <string name="settings" msgid="5849739030579520686">"Einstellungen"</string>
+    <string name="settings" msgid="5849739030579520686">Einstellungen</string>
     <string name="snooze_duration_title" msgid="1097309861110780483">"Dauer der Schlummerfunktion"</string>
     <string name="crescendo_duration_title" msgid="8606408542726189528">"Lautstärke schrittweise erhöhen"</string>
     <string name="auto_silence_title" msgid="2012754009554434544">"Stummschalten nach"</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>
+        <item quantity="one">1 Minute</item>
+        <item quantity="other"><xliff:g id="formatted_number" example="7">%s</xliff:g> Minuten</item>
     </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Nie"</string>
-  <string-array name="auto_silence_entries">
-    <item msgid="3024545954917711306">"1 Minute"</item>
-    <item msgid="5431906692406316549">"5 Minuten"</item>
-    <item msgid="7742728812068919959">"10 Minuten"</item>
-    <item msgid="2855948657259647629">"15 Minuten"</item>
-    <item msgid="6330196381284475079">"20 Minuten"</item>
-    <item msgid="7809240121716151904">"25 Minuten"</item>
-    <item msgid="4278641338024561333">"Nie"</item>
-  </string-array>
-  <string-array name="crescendo_entries">
-    <item msgid="7435149932182641128">"Aus"</item>
-    <item msgid="7195451681426992018">"5 Sekunden"</item>
-    <item msgid="592917601923801901">"10 Sekunden"</item>
-    <item msgid="5050318776687582653">"15 Sekunden"</item>
-    <item msgid="6997726466563948756">"20 Sekunden"</item>
-    <item msgid="1237360231425097772">"25 Sekunden"</item>
-    <item msgid="248014374051498284">"30 Sekunden"</item>
-    <item msgid="6110450211551791852">"35 Sekunden"</item>
-    <item msgid="8010211657612404516">"40 Sekunden"</item>
-    <item msgid="3730631498119797451">"45 Sekunden"</item>
-    <item msgid="623829984393124488">"50 Sekunden"</item>
-    <item msgid="6390209981529164605">"55 Sekunden"</item>
-    <item msgid="5261571706794132923">"60 Sekunden"</item>
-  </string-array>
-  <string-array name="snooze_duration_entries">
-    <item msgid="7668553664977446797">"1 Minute"</item>
-    <item msgid="4482596794620161030">"2 Minuten"</item>
-    <item msgid="8478276201849960314">"3 Minuten"</item>
-    <item msgid="4038456474851212478">"4 Minuten"</item>
-    <item msgid="6298175579152122770">"5 Minuten"</item>
-    <item msgid="9021860177999278496">"6 Minuten"</item>
-    <item msgid="7224689200902680256">"7 Minuten"</item>
-    <item msgid="4610012663985162123">"8 Minuten"</item>
-    <item msgid="1717028898015659426">"9 Minuten"</item>
-    <item msgid="8058492636464337699">"10 Minuten"</item>
-    <item msgid="577767219993868603">"11 Minuten"</item>
-    <item msgid="3710047869487864775">"12 Minuten"</item>
-    <item msgid="3794200935630619331">"13 Minuten"</item>
-    <item msgid="5462266433522229437">"14 Minuten"</item>
-    <item msgid="2192100038569306041">"15 Minuten"</item>
-    <item msgid="6636326047858437620">"16 Minuten"</item>
-    <item msgid="2481054808772108352">"17 Minuten"</item>
-    <item msgid="4080984064428458050">"18 Minuten"</item>
-    <item msgid="5844319398703041730">"19 Minuten"</item>
-    <item msgid="2334964289857921073">"20 Minuten"</item>
-    <item msgid="4755209855817904977">"21 Minuten"</item>
-    <item msgid="8414394445389367355">"22 Minuten"</item>
-    <item msgid="2604612428763230265">"23 Minuten"</item>
-    <item msgid="6871696471373403806">"24 Minuten"</item>
-    <item msgid="1573685398431466364">"25 Minuten"</item>
-    <item msgid="6999090368236684971">"26 Minuten"</item>
-    <item msgid="7125056720603734703">"27 Minuten"</item>
-    <item msgid="1695830988496463030">"28 Minuten"</item>
-    <item msgid="6706610539793025916">"29 Minuten"</item>
-    <item msgid="2898212818965905529">"30 Minuten"</item>
-  </string-array>
+    <string-array name="auto_silence_entries">
+        <item msgid="3024545954917711306">"1 Minute"</item>
+        <item msgid="5431906692406316549">"5 Minuten"</item>
+        <item msgid="7742728812068919959">"10 Minuten"</item>
+        <item msgid="2855948657259647629">"15 Minuten"</item>
+        <item msgid="6330196381284475079">"20 Minuten"</item>
+        <item msgid="7809240121716151904">"25 Minuten"</item>
+        <item msgid="4278641338024561333">"Nie"</item>
+    </string-array>
+    <string-array name="crescendo_entries">
+        <item msgid="7435149932182641128">"Aus"</item>
+        <item msgid="7195451681426992018">"5 Sekunden"</item>
+        <item msgid="592917601923801901">"10 Sekunden"</item>
+        <item msgid="5050318776687582653">"15 Sekunden"</item>
+        <item msgid="6997726466563948756">"20 Sekunden"</item>
+        <item msgid="1237360231425097772">"25 Sekunden"</item>
+        <item msgid="248014374051498284">"30 Sekunden"</item>
+        <item msgid="6110450211551791852">"35 Sekunden"</item>
+        <item msgid="8010211657612404516">"40 Sekunden"</item>
+        <item msgid="3730631498119797451">"45 Sekunden"</item>
+        <item msgid="623829984393124488">"50 Sekunden"</item>
+        <item msgid="6390209981529164605">"55 Sekunden"</item>
+        <item msgid="5261571706794132923">"60 Sekunden"</item>
+    </string-array>
+    <string-array name="snooze_duration_entries">
+        <item msgid="7668553664977446797">"1 Minute"</item>
+        <item msgid="4482596794620161030">"2 Minuten"</item>
+        <item msgid="8478276201849960314">"3 Minuten"</item>
+        <item msgid="4038456474851212478">"4 Minuten"</item>
+        <item msgid="6298175579152122770">"5 Minuten"</item>
+        <item msgid="9021860177999278496">"6 Minuten"</item>
+        <item msgid="7224689200902680256">"7 Minuten"</item>
+        <item msgid="4610012663985162123">"8 Minuten"</item>
+        <item msgid="1717028898015659426">"9 Minuten"</item>
+        <item msgid="8058492636464337699">"10 Minuten"</item>
+        <item msgid="577767219993868603">"11 Minuten"</item>
+        <item msgid="3710047869487864775">"12 Minuten"</item>
+        <item msgid="3794200935630619331">"13 Minuten"</item>
+        <item msgid="5462266433522229437">"14 Minuten"</item>
+        <item msgid="2192100038569306041">"15 Minuten"</item>
+        <item msgid="6636326047858437620">"16 Minuten"</item>
+        <item msgid="2481054808772108352">"17 Minuten"</item>
+        <item msgid="4080984064428458050">"18 Minuten"</item>
+        <item msgid="5844319398703041730">"19 Minuten"</item>
+        <item msgid="2334964289857921073">"20 Minuten"</item>
+        <item msgid="4755209855817904977">"21 Minuten"</item>
+        <item msgid="8414394445389367355">"22 Minuten"</item>
+        <item msgid="2604612428763230265">"23 Minuten"</item>
+        <item msgid="6871696471373403806">"24 Minuten"</item>
+        <item msgid="1573685398431466364">"25 Minuten"</item>
+        <item msgid="6999090368236684971">"26 Minuten"</item>
+        <item msgid="7125056720603734703">"27 Minuten"</item>
+        <item msgid="1695830988496463030">"28 Minuten"</item>
+        <item msgid="6706610539793025916">"29 Minuten"</item>
+        <item msgid="2898212818965905529">"30 Minuten"</item>
+    </string-array>
     <string name="week_start_title" msgid="4268917518596832096">"Wochenbeginn am"</string>
-  <string-array name="week_start_entries">
-    <item msgid="9010198173394482639">"Samstag"</item>
-    <item msgid="3993530639455360921">"Sonntag"</item>
-    <item msgid="8594709368683324282">"Montag"</item>
-  </string-array>
+    <string-array name="week_start_entries">
+        <item msgid="9010198173394482639">"Samstag"</item>
+        <item msgid="3993530639455360921">"Sonntag"</item>
+        <item msgid="8594709368683324282">"Montag"</item>
+    </string-array>
     <string name="alarm_volume_title" msgid="8506245173912428522">"Lautstärke für Wecker"</string>
     <string name="silent_ringtone_title" msgid="6177287302898634765">"Lautlos"</string>
     <string name="unknown_ringtone_title" msgid="6637522029614550112">"Unbekannt"</string>
@@ -185,11 +182,11 @@
     <string name="app_notifications_blocked" msgid="7249150789023936889">"Benachrichtigungen für die Uhr sind blockiert"</string>
     <string name="alarms_blocked_by_dnd" msgid="6089433757505898969">"Gerät ist im Modus \"Lautlos\""</string>
     <string name="volume_button_setting_title" msgid="6937131248843413357">"Lautstärketaste"</string>
-  <string-array name="volume_button_setting_entries">
-    <item msgid="7972756698723318690">"Schlummern"</item>
-    <item msgid="3450979320164769576">"Beenden"</item>
-    <item msgid="7085774139907653538">"Lautstärke regeln"</item>
-  </string-array>
+    <string-array name="volume_button_setting_entries">
+        <item msgid="7972756698723318690">"Schlummern"</item>
+        <item msgid="3450979320164769576">"Beenden"</item>
+        <item msgid="7085774139907653538">"Lautstärke regeln"</item>
+    </string-array>
     <string name="label_description" msgid="8736179296142915727">"Name"</string>
     <string name="ringtone_description" msgid="7580922112921069925">"Klingelton"</string>
     <string name="menu_alarm" msgid="4772010125376647519">"Wecker"</string>
@@ -213,7 +210,7 @@
     <string name="hours_label" msgid="3393478155635368097">"h"</string>
     <string name="minutes_label" msgid="3568098128251438588">"m"</string>
     <string name="seconds_label" msgid="124655952824003246">"s"</string>
-    <string name="timer_setup_description" msgid="2488277921227564704">"<xliff:g id="HOURS">%1$s</xliff:g>, <xliff:g id="MINUTES">%2$s</xliff:g>, <xliff:g id="SECONDS">%3$s</xliff:g>"</string>
+    <string name="timer_setup_description" msgid="2488277921227564704"><xliff:g id="hours" example="1 hour">%1$s</xliff:g>, <xliff:g id="minutes" example="15 minutes">%2$s</xliff:g>, <xliff:g id="seconds" example="30 seconds">%3$s</xliff:g></string>
     <string name="lap_number_single_digit" msgid="1051159504304610877">"Nr. <xliff:g id="LAPNUMBER">%d</xliff:g>"</string>
     <string name="lap_number_double_digit" msgid="2138536756534362037">"Nr. <xliff:g id="LAPNUMBER">%02d</xliff:g>"</string>
     <string name="sw_share_main" msgid="7703563468204234405">"Meine Zeit: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -231,133 +228,133 @@
     <string name="timer_reset" msgid="7848424809190171640">"Zurücksetzen"</string>
     <string name="timer_cancel" msgid="3572868404230815644">"Abbrechen"</string>
     <string name="timer_canceled" msgid="7327923392567128060">"Timer abgebrochen"</string>
-    <string name="timer_times_up" msgid="9190440395938519009">"Zeit ist abgelaufen."</string>
-    <string name="timer_multi_times_up" msgid="1239104626836080409">"<xliff:g id="NUM_TIMERS">%d</xliff:g> Timer abgelaufen"</string>
-    <string name="timer_multi_missed" msgid="9085073572920385362">"<xliff:g id="NUMBER">%d</xliff:g> verpasste Timer"</string>
+    <string name="timer_times_up" msgid="9190440395938519009">Zeit ist abgelaufen</string>
+    <string name="timer_multi_times_up" msgid="1239104626836080409"><xliff:g id="NUM_TIMERS" example="2">%d</xliff:g> Timer abgelaufen</string>
+    <string name="timer_multi_missed" msgid="9085073572920385362"><xliff:g id="number" example="2">%d</xliff:g> verpasste Timer</string>
     <string name="timer_notification_label" msgid="4933184831583137249">"Timer"</string>
     <string name="missed_timer_notification_label" msgid="6661928727623284334">"Verpasster Timer"</string>
-    <string name="missed_named_timer_notification_label" msgid="665604640028289175">"Verpasster Timer: <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="missed_named_timer_notification_label" msgid="665604640028289175">Verpasster Timer: <xliff:g id="name" example="Pick up kids">%s</xliff:g></string>
     <string name="timer_pause" msgid="3748323712728398743">"Pausieren"</string>
     <string name="timer_reset_all" msgid="7530633132757866087">"Alle Timer zurücksetzen"</string>
-    <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
-    <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
+    <string name="hours_minutes_seconds" msgid="5680088738059791288"><xliff:g id="hours" example="2">%1$d</xliff:g>:<xliff:g id="minutes" example="3">%2$02d</xliff:g>:<xliff:g id="seconds" example="44">%3$02d</xliff:g></string>
+    <string name="minutes_seconds" msgid="6189446107009577914"><xliff:g id="minutes" example="3">%1$d</xliff:g>:<xliff:g id="seconds" example="44">%2$02d</xliff:g></string>
     <!-- no translation found for seconds (6550091082396571898) -->
-    <skip />
-  <string-array name="sw_share_strings">
-    <item msgid="842841032273927988">"Du bist teuflisch schnell."</item>
-    <item msgid="6332879039890727169">"Ernte die Früchte deiner Arbeit!"</item>
-    <item msgid="815382761274660130">"Du bist ja schneller als ein Roboter!"</item>
-    <item msgid="7916250650982813737">"Puh!"</item>
-    <item msgid="6836603904515182333">"L33t-Zeiten"</item>
-    <item msgid="7508085100680861631">"Wahnsinnsgeschwindigkeit"</item>
-    <item msgid="5961245252909589573">"Let\'s do the time warp again!"</item>
-    <item msgid="5211891900854545940">"Just a jump to the left."</item>
-    <item msgid="9071353477103826053">"Du hast es ganz schön eilig."</item>
-    <item msgid="3785193933691117181">"Photonengeschwindigkeit"</item>
-  </string-array>
+    <skip/>
+    <string-array name="sw_share_strings">
+        <item msgid="842841032273927988">"Du bist teuflisch schnell."</item>
+        <item msgid="6332879039890727169">"Ernte die Früchte deiner Arbeit!"</item>
+        <item msgid="815382761274660130">"Du bist ja schneller als ein Roboter!"</item>
+        <item msgid="7916250650982813737">"Puh!"</item>
+        <item msgid="6836603904515182333">"L33t-Zeiten"</item>
+        <item msgid="7508085100680861631">"Wahnsinnsgeschwindigkeit"</item>
+        <item msgid="5961245252909589573">"Let\'s do the time warp again!"</item>
+        <item msgid="5211891900854545940">"Just a jump to the left."</item>
+        <item msgid="9071353477103826053">"Du hast es ganz schön eilig."</item>
+        <item msgid="3785193933691117181">"Photonengeschwindigkeit"</item>
+    </string-array>
     <string name="home_label" msgid="4436139365695453870">"Zuhause"</string>
     <string name="cities_activity_title" msgid="8552462751129256730">"Städte"</string>
     <string name="clock_settings" msgid="8317286807280600391">"Uhr"</string>
     <string name="clock_style" msgid="2265011060429742344">"Design"</string>
     <string name="display_clock_seconds_pref" msgid="691506643469501643">"Zeit mit Sekunden anzeigen"</string>
     <string name="open_date_settings" msgid="7712226973337806152">"Datum &amp; Uhrzeit ändern"</string>
-  <string-array name="clock_style_entries">
-    <item msgid="917900462224167608">"Analog"</item>
-    <item msgid="8483930821046925592">"Digital"</item>
-  </string-array>
+    <string-array name="clock_style_entries">
+        <item msgid="917900462224167608">"Analog"</item>
+        <item msgid="8483930821046925592">"Digital"</item>
+    </string-array>
     <string name="automatic_home_clock" msgid="6274174710735449252">"Uhr mit Heimatzeitzone"</string>
     <string name="automatic_home_clock_summary" msgid="6020476321040807273">"Bei Aufenthalt in einer anderen Zeitzone Uhr für Heimatzeitzone hinzufügen"</string>
     <string name="home_time_zone" msgid="9199730676287974501">"Heimatzeitzone"</string>
     <string name="home_time_zone_title" msgid="807894493443834624">"Heimatzeitzone"</string>
     <string name="city_checked" msgid="616847871968019">"<xliff:g id="CITY_NAME">%s</xliff:g> ausgewählt"</string>
     <string name="city_unchecked" msgid="710212932781145918">"<xliff:g id="CITY_NAME">%s</xliff:g> nicht ausgewählt"</string>
-  <string-array name="timezone_labels">
-    <item msgid="5495601234086197399">"Marshallinseln"</item>
-    <item msgid="4196408495909011020">"Midwayinseln"</item>
-    <item msgid="1414384194857730006">"Hawaii"</item>
-    <item msgid="2687091371581931926">"Alaska"</item>
-    <item msgid="1922100269679049660">"Pacific Time"</item>
-    <item msgid="7156402158716866161">"Tijuana"</item>
-    <item msgid="1144117502254612241">"Arizona"</item>
-    <item msgid="101284182011722637">"Chihuahua"</item>
-    <item msgid="689121094232986897">"Mountain Time"</item>
-    <item msgid="5445331923942302756">"Mittelamerika"</item>
-    <item msgid="2749806434052452351">"Central Time"</item>
-    <item msgid="3997138870229703753">"Mexiko-Stadt"</item>
-    <item msgid="5425567073027744888">"Saskatchewan"</item>
-    <item msgid="2877342865396629368">"Bogotá"</item>
-    <item msgid="568682398893899670">"Eastern Time"</item>
-    <item msgid="668135984541863866">"Venezuela"</item>
-    <item msgid="3737474220861486223">"Atlantik (Barbados)"</item>
-    <item msgid="6279116051273436870">"Atlantik (Kanada)"</item>
-    <item msgid="8513382867172014244">"Manaus"</item>
-    <item msgid="7776299003105932407">"Santiago"</item>
-    <item msgid="8636989494746218677">"Neufundland"</item>
-    <item msgid="4402541016410147505">"Brasília"</item>
-    <item msgid="2251184440733164084">"Buenos Aires"</item>
-    <item msgid="6202926618569004969">"Grönland"</item>
-    <item msgid="2355275037115290628">"Montevideo"</item>
-    <item msgid="1377549694711708945">"Mittlerer Atlantik"</item>
-    <item msgid="3457671272126347981">"Azoren"</item>
-    <item msgid="3659315141063710840">"Kapverdische Inseln"</item>
-    <item msgid="1260941741802367635">"Casablanca"</item>
-    <item msgid="8275203689687954762">"London, Dublin"</item>
-    <item msgid="5970179539479320905">"Amsterdam, Berlin"</item>
-    <item msgid="5396319478750517962">"Belgrad"</item>
-    <item msgid="8688787475056663004">"Brüssel"</item>
-    <item msgid="3415827874921681622">"Sarajevo"</item>
-    <item msgid="402008965928320066">"Windhoek"</item>
-    <item msgid="6436942724959275569">"West Africa Time"</item>
-    <item msgid="954536568417204026">"Amman, Jordanien"</item>
-    <item msgid="8932745482008902551">"Athen, Istanbul"</item>
-    <item msgid="320025725949024510">"Beirut, Libanon"</item>
-    <item msgid="7242083112551905970">"Kairo"</item>
-    <item msgid="7241520146011450419">"Helsinki"</item>
-    <item msgid="2717065017510546526">"Jerusalem"</item>
-    <item msgid="8698556287741466553">"Minsk"</item>
-    <item msgid="1797598357342084506">"Harare"</item>
-    <item msgid="5169119919905066998">"Bagdad"</item>
-    <item msgid="2615788116201065182">"Moskau"</item>
-    <item msgid="9084354867885584646">"Kuwait"</item>
-    <item msgid="1351570519986178268">"Nairobi"</item>
-    <item msgid="7094569580635877460">"Teheran"</item>
-    <item msgid="3953138772617909704">"Baku"</item>
-    <item msgid="2868893113598800752">"Tiflis"</item>
-    <item msgid="7088581865802476373">"Eriwan"</item>
-    <item msgid="1941122257623887992">"Dubai"</item>
-    <item msgid="9194797225058249720">"Kabul"</item>
-    <item msgid="6486569254364577332">"Islamabad, Karatschi"</item>
-    <item msgid="5487724896895412089">"Oral"</item>
-    <item msgid="364906869710826982">"Yekaterinburg"</item>
-    <item msgid="2106505051751383358">"Kalkutta"</item>
-    <item msgid="6851586621581501447">"Sri Lanka"</item>
-    <item msgid="800438544128213134">"Kathmandu"</item>
-    <item msgid="6173621471007643021">"Astana"</item>
-    <item msgid="8645125891971581128">"Rangun"</item>
-    <item msgid="2886407505119737794">"Krasnoyarsk"</item>
-    <item msgid="3408222398188107090">"Bangkok"</item>
-    <item msgid="4441612937172851228">"Peking"</item>
-    <item msgid="4936715789028996930">"Hongkong"</item>
-    <item msgid="4261031143777385525">"Irkutsk"</item>
-    <item msgid="3538060959338191835">"Kuala Lumpur"</item>
-    <item msgid="1438847562643099201">"Perth"</item>
-    <item msgid="3063913827688244383">"Taipeh"</item>
-    <item msgid="3502757135046564209">"Seoul"</item>
-    <item msgid="6107588684519111669">"Tokio, Osaka"</item>
-    <item msgid="4350769099755608471">"Yakutsk"</item>
-    <item msgid="2422707004533526462">"Adelaide"</item>
-    <item msgid="1292192084554134339">"Darwin"</item>
-    <item msgid="1320883699470001716">"Brisbane"</item>
-    <item msgid="5137198806146386527">"Hobart"</item>
-    <item msgid="5920063686933941174">"Sydney, Canberra"</item>
-    <item msgid="615906039696009425">"Vladivostok"</item>
-    <item msgid="7738680449356275374">"Guam"</item>
-    <item msgid="2882915026380778227">"Magadan"</item>
-    <item msgid="8255615641810148152">"Auckland"</item>
-    <item msgid="3027153773466391728">"Fidschi"</item>
-    <item msgid="5911600083231840181">"Tonga"</item>
-    <item msgid="5176858645450908751">"Jakarta"</item>
-  </string-array>
+    <string-array name="timezone_labels">
+        <item msgid="5495601234086197399">"Marshallinseln"</item>
+        <item msgid="4196408495909011020">"Midwayinseln"</item>
+        <item msgid="1414384194857730006">"Hawaii"</item>
+        <item msgid="2687091371581931926">"Alaska"</item>
+        <item msgid="1922100269679049660">"Pacific Time"</item>
+        <item msgid="7156402158716866161">"Tijuana"</item>
+        <item msgid="1144117502254612241">"Arizona"</item>
+        <item msgid="101284182011722637">"Chihuahua"</item>
+        <item msgid="689121094232986897">"Mountain Time"</item>
+        <item msgid="5445331923942302756">"Mittelamerika"</item>
+        <item msgid="2749806434052452351">"Central Time"</item>
+        <item msgid="3997138870229703753">"Mexiko-Stadt"</item>
+        <item msgid="5425567073027744888">"Saskatchewan"</item>
+        <item msgid="2877342865396629368">"Bogotá"</item>
+        <item msgid="568682398893899670">"Eastern Time"</item>
+        <item msgid="668135984541863866">"Venezuela"</item>
+        <item msgid="3737474220861486223">"Atlantik (Barbados)"</item>
+        <item msgid="6279116051273436870">"Atlantik (Kanada)"</item>
+        <item msgid="8513382867172014244">"Manaus"</item>
+        <item msgid="7776299003105932407">"Santiago"</item>
+        <item msgid="8636989494746218677">"Neufundland"</item>
+        <item msgid="4402541016410147505">"Brasília"</item>
+        <item msgid="2251184440733164084">"Buenos Aires"</item>
+        <item msgid="6202926618569004969">"Grönland"</item>
+        <item msgid="2355275037115290628">"Montevideo"</item>
+        <item msgid="1377549694711708945">"Mittlerer Atlantik"</item>
+        <item msgid="3457671272126347981">"Azoren"</item>
+        <item msgid="3659315141063710840">"Kapverdische Inseln"</item>
+        <item msgid="1260941741802367635">"Casablanca"</item>
+        <item msgid="8275203689687954762">"London, Dublin"</item>
+        <item msgid="5970179539479320905">"Amsterdam, Berlin"</item>
+        <item msgid="5396319478750517962">"Belgrad"</item>
+        <item msgid="8688787475056663004">"Brüssel"</item>
+        <item msgid="3415827874921681622">"Sarajevo"</item>
+        <item msgid="402008965928320066">"Windhoek"</item>
+        <item msgid="6436942724959275569">"West Africa Time"</item>
+        <item msgid="954536568417204026">"Amman, Jordanien"</item>
+        <item msgid="8932745482008902551">"Athen, Istanbul"</item>
+        <item msgid="320025725949024510">"Beirut, Libanon"</item>
+        <item msgid="7242083112551905970">"Kairo"</item>
+        <item msgid="7241520146011450419">"Helsinki"</item>
+        <item msgid="2717065017510546526">"Jerusalem"</item>
+        <item msgid="8698556287741466553">"Minsk"</item>
+        <item msgid="1797598357342084506">"Harare"</item>
+        <item msgid="5169119919905066998">"Bagdad"</item>
+        <item msgid="2615788116201065182">"Moskau"</item>
+        <item msgid="9084354867885584646">"Kuwait"</item>
+        <item msgid="1351570519986178268">"Nairobi"</item>
+        <item msgid="7094569580635877460">"Teheran"</item>
+        <item msgid="3953138772617909704">"Baku"</item>
+        <item msgid="2868893113598800752">"Tiflis"</item>
+        <item msgid="7088581865802476373">"Eriwan"</item>
+        <item msgid="1941122257623887992">"Dubai"</item>
+        <item msgid="9194797225058249720">"Kabul"</item>
+        <item msgid="6486569254364577332">"Islamabad, Karatschi"</item>
+        <item msgid="5487724896895412089">"Oral"</item>
+        <item msgid="364906869710826982">"Yekaterinburg"</item>
+        <item msgid="2106505051751383358">"Kalkutta"</item>
+        <item msgid="6851586621581501447">"Sri Lanka"</item>
+        <item msgid="800438544128213134">"Kathmandu"</item>
+        <item msgid="6173621471007643021">"Astana"</item>
+        <item msgid="8645125891971581128">"Rangun"</item>
+        <item msgid="2886407505119737794">"Krasnoyarsk"</item>
+        <item msgid="3408222398188107090">"Bangkok"</item>
+        <item msgid="4441612937172851228">"Peking"</item>
+        <item msgid="4936715789028996930">"Hongkong"</item>
+        <item msgid="4261031143777385525">"Irkutsk"</item>
+        <item msgid="3538060959338191835">"Kuala Lumpur"</item>
+        <item msgid="1438847562643099201">"Perth"</item>
+        <item msgid="3063913827688244383">"Taipeh"</item>
+        <item msgid="3502757135046564209">"Seoul"</item>
+        <item msgid="6107588684519111669">"Tokio, Osaka"</item>
+        <item msgid="4350769099755608471">"Yakutsk"</item>
+        <item msgid="2422707004533526462">"Adelaide"</item>
+        <item msgid="1292192084554134339">"Darwin"</item>
+        <item msgid="1320883699470001716">"Brisbane"</item>
+        <item msgid="5137198806146386527">"Hobart"</item>
+        <item msgid="5920063686933941174">"Sydney, Canberra"</item>
+        <item msgid="615906039696009425">"Vladivostok"</item>
+        <item msgid="7738680449356275374">"Guam"</item>
+        <item msgid="2882915026380778227">"Magadan"</item>
+        <item msgid="8255615641810148152">"Auckland"</item>
+        <item msgid="3027153773466391728">"Fidschi"</item>
+        <item msgid="5911600083231840181">"Tonga"</item>
+        <item msgid="5176858645450908751">"Jakarta"</item>
+    </string-array>
     <string name="shortcut_new_alarm_short" msgid="3490418929139725538">"Neuer Wecker"</string>
     <string name="shortcut_new_alarm_long" msgid="4778064830147981089">"Neuen Weckruf erstellen"</string>
     <string name="shortcut_new_timer_short" msgid="3793414543219297884">"Neuer Timer"</string>
@@ -378,10 +375,10 @@
     <string name="timer_settings" msgid="7955522143086154795">"Timer"</string>
     <string name="timer_vibrate_title" msgid="7788920024785587518">"Vibrationsalarm des Timers"</string>
     <string name="timer_paused" msgid="5941160896040771462">"Timer pausiert"</string>
-    <string name="timers_stopped" msgid="3186191253226005149">"<xliff:g id="NUMBER">%d</xliff:g> Timer pausiert"</string>
+    <string name="timers_stopped" msgid="3186191253226005149"><xliff:g id="number" example="7">%d</xliff:g> Timer pausiert</string>
     <string name="all_timers_stopped_notif" msgid="883027111895833440">"Tippen, um Timer abzurufen"</string>
-    <string name="timers_in_use" msgid="5570729467344408506">"<xliff:g id="NUMBER">%d</xliff:g> Timer"</string>
-    <string name="next_timer_notif" msgid="6136454740115613653">"Nächster Timer: <xliff:g id="TIME_REMAINING">%s</xliff:g>"</string>
+    <string name="timers_in_use" msgid="5570729467344408506"><xliff:g id="number" example="7">%d</xliff:g> Timer</string>
+    <string name="next_timer_notif" msgid="6136454740115613653">Nächster Timer: <xliff:g id="time_remaining" example="2 minutes remaining">%s</xliff:g></string>
     <string name="screensaver_settings" msgid="1780742944194267226">"Bildschirmschoner-Einstellungen"</string>
     <string name="night_mode_title" msgid="5983813889469616299">"Nachtmodus"</string>
     <string name="night_mode_summary" msgid="1017350187324162631">"Stark gedimmtes Display (für dunkle Räume)"</string>
@@ -389,37 +386,37 @@
     <string name="collapse_alarm" msgid="3561772046433483980">"Wecker minimieren"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"Rückgängig"</string>
     <string name="alarm_deleted" msgid="6131529309389084785">"Weckzeit gelöscht"</string>
-    <string name="world_day_of_week_label" msgid="5911196322328341288">"/<xliff:g id="LABEL">%s</xliff:g>"</string>
-    <string name="world_time_ahead" msgid="625559988238637652">"<xliff:g id="TIME">%1$s</xliff:g> vor"</string>
-    <string name="world_time_behind" msgid="5395771290726167865">"<xliff:g id="TIME">%1$s</xliff:g> zurück"</string>
-    <string name="world_hours_minutes_ahead" msgid="5132012793021696377">"<xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g> vor"</string>
-    <string name="world_hours_minutes_behind" msgid="8978567362140923698">"<xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g> zurück"</string>
-    <string name="world_hours_tomorrow" msgid="2504465609269004794">"Morgen, <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="world_hours_yesterday" msgid="4425086322610882745">"Gestern, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="world_day_of_week_label" msgid="5911196322328341288"> / <xliff:g id="label">%s</xliff:g></string>
+    <string name="world_time_ahead" msgid="625559988238637652"><xliff:g id="time" example="6 hours">%1$s</xliff:g> vor</string>
+    <string name="world_time_behind" msgid="5395771290726167865"><xliff:g id="time" example="4 hours">%1$s</xliff:g> zurück</string>
+    <string name="world_hours_minutes_ahead" msgid="5132012793021696377"><xliff:g id="hours" example="6 hr">%1$s</xliff:g> <xliff:g id="minutes" example="30 min">%2$s</xliff:g> voraus</string>
+    <string name="world_hours_minutes_behind" msgid="8978567362140923698"><xliff:g id="hours" example="4 hr">%1$s</xliff:g> <xliff:g id="minutes" example="30 min">%2$s</xliff:g> zurück</string>
+    <string name="world_hours_tomorrow" msgid="2504465609269004794">Morgen, <xliff:g id="time" example="6 hours ahead">%1$s</xliff:g></string>
+    <string name="world_hours_yesterday" msgid="4425086322610882745">Gestern, <xliff:g id="time" example="4 hours behind">%1$s</xliff:g></string>
     <string name="world_tomorrow" msgid="7633067935455580920">"Morgen"</string>
     <string name="world_yesterday" msgid="5430990920477833164">"Gestern"</string>
-    <string name="next_alarm_description" msgid="2650244835760747046">"Nächste Weckzeit: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
+    <string name="next_alarm_description" msgid="2650244835760747046">Nächste Weckzeit: <xliff:g id="alarm_time" example="Wed 8:00am">%s</xliff:g></string>
     <string name="no_alarms" msgid="6429431324842022917">"Keine Wecker"</string>
-    <string name="invalid_time" msgid="2782334750243998633">"Ungültige Zeit: <xliff:g id="INVALID_HOUR">%1$d</xliff:g>:<xliff:g id="INVALID_MINUTES">%2$d</xliff:g> <xliff:g id="INVALID_AMPM">%3$s</xliff:g>"</string>
-    <string name="no_alarm_at" msgid="8140632482969193119">"Kein Weckruf um <xliff:g id="ALARM_TIME_HOUR">%1$d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%2$d</xliff:g> vorhanden"</string>
+    <string name="invalid_time" msgid="2782334750243998633">Ungültige Zeit: <xliff:g id="invalid_hour" example="25">%1$d</xliff:g>:<xliff:g id="invalid_minutes" example="63">%2$d</xliff:g> <xliff:g id="invalid_ampm" example="PM">%3$s</xliff:g></string>
+    <string name="no_alarm_at" msgid="8140632482969193119">Kein Weckruf um <xliff:g id="alarm_time_hour" example="14">%1$d</xliff:g>:<xliff:g id="alarm_time_minutes" example="23">%2$d</xliff:g> vorhanden</string>
     <string name="no_scheduled_alarms" msgid="2115420148192753534">"Keine eingerichteten Weckrufe"</string>
     <string name="no_label_specified" msgid="2008482054428460626">"Kein Name angegeben"</string>
-    <string name="no_alarms_with_label" msgid="6250998794542941665">"Der Name ist in keinem Weckruf enthalten."</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>
-    <string name="alarm_is_set" msgid="5503226382620011088">"Weckzeit: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
+    <string name="no_alarms_with_label" msgid="6250998794542941665">Das Kennzeichen ist in keinem Weckruf enthalten</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" example="14:20">%s</xliff:g> wurde verworfen</string>
+    <string name="alarm_is_set" msgid="5503226382620011088">Weckzeit gestellt auf <xliff:g id="alarm_time" example="14:20">%s</xliff:g></string>
     <string name="timer_created" msgid="4381027137335885547">"Timer erstellt"</string>
     <plurals name="expired_timers_dismissed" formatted="false" msgid="1294953410988488149">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> Timer ausgeschaltet</item>
-      <item quantity="one">Timer ausgeschaltet</item>
+        <item quantity="one">Timer verworfen</item>
+        <item quantity="other"><xliff:g id="number" example="5">%d</xliff:g> Timer verworfen</item>
     </plurals>
     <string name="timer_deleted" msgid="9110322362460029392">"Timer gelöscht"</string>
     <string name="invalid_timer_length" msgid="3104567893212932487">"Ungültige Dauer für Timer"</string>
     <string name="invalid_timer" msgid="900957020728335675">"Ungültiger Timer ausgewählt"</string>
     <string name="no_expired_timers" msgid="4624192298397846876">"Keine abgelaufenen Timer"</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="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">Der Weckruf um <xliff:g id="alarm_time" example="14:20">%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>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">Für den Weckruf um <xliff:g id="alarm_time" example="14:20">%s</xliff:g> wurde die Schlummerfunktion für 10 Minuten aktiviert</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 75503881d..187600644 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- 
   Copyright (C) 2016 The Android Open Source Project
 
@@ -13,23 +13,20 @@
   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.
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"Horloge"</string>
-    <string name="label" msgid="162189613902857319">"Titre"</string>
-    <string name="default_label" msgid="5590025289805630372">"Alarme"</string>
-    <string name="alarm_vibrate" msgid="3476686921490362230">"Vibreur"</string>
-    <string name="alarm_repeat" msgid="7242985466344233206">"Répéter"</string>
-    <string name="delete" msgid="5732434972457000541">"Supprimer"</string>
-    <string name="default_alarm_ringtone_title" msgid="2916376768509623643">"Son de l\'alarme par défaut"</string>
-    <string name="alarm_sound" msgid="8754499591391638405">"Son de l\'alarme"</string>
-    <string name="timer_sound" msgid="896163086604894735">"Son du minuteur"</string>
-    <string name="add_new_sound" msgid="2546936797351540244">"Ajouter"</string>
-    <string name="remove_sound" msgid="2064643204455734239">"Supprimer"</string>
-    <string name="confirm_remove_custom_ringtone" msgid="1724111242265208553">"Les alarmes et les minuteurs qui utilisaient ce son émettront le son par défaut."</string>
-    <string name="your_sounds" msgid="1672779351352629681">"Vos sons"</string>
+   --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="6674495003718166674">Horloge</string>
+    <string name="label" msgid="162189613902857319">Titre</string>
+    <string name="default_label" msgid="5590025289805630372">Alarme</string>
+    <string name="alarm_vibrate" msgid="3476686921490362230">Vibrer</string>
+    <string name="alarm_repeat" msgid="7242985466344233206">Répéter</string>
+    <string name="delete" msgid="5732434972457000541">Supprimer</string>
+    <string name="default_alarm_ringtone_title" msgid="2916376768509623643">Son de l\'alarme par défaut</string>
+    <string name="alarm_sound" msgid="8754499591391638405">Son de l\'alarme</string>
+    <string name="timer_sound" msgid="896163086604894735">Son du minuteur</string>
+    <string name="add_new_sound" msgid="2546936797351540244">Ajouter</string>
+    <string name="remove_sound" msgid="2064643204455734239">Supprimer</string>
+    <string name="confirm_remove_custom_ringtone" msgid="1724111242265208553">Les alarmes et les minuteurs qui utilisaient ce son émettront désormais le son par défaut.</string>
+    <string name="your_sounds" msgid="1672779351352629681">Vos sons</string>
     <string name="device_sounds" msgid="1584894148222639823">"Sons de l\'appareil"</string>
     <string name="custom_ringtone_lost_permissions" msgid="3406310054255354331">"Impossible d\'accéder au contenu sonore."</string>
     <string name="default_timer_ringtone_title" msgid="1370799536406862317">"Minuteur arrivé à expiration"</string>
@@ -40,64 +37,72 @@
     <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
     <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Répétée"</string>
     <plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
+        <item quantity="one">1 min</item>
+        <item quantity="many"><xliff:g id="number" example="7">%d</xliff:g> min</item>
+        <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> min</item>
     </plurals>
     <string name="alarm_alert_off_text" msgid="4472073417593915002">"Alarme arrêtée"</string>
     <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Répéter"</string>
     <plurals name="alarm_alert_snooze_set" formatted="false" msgid="3212729193036041768">
-      <item quantity="one">Répétition après <xliff:g id="MINUTES">%d</xliff:g> minute</item>
-      <item quantity="other">Répétition après <xliff:g id="MINUTES">%d</xliff:g> minutes</item>
+        <item quantity="one">Répéter dans 1 minute.</item>
+        <item quantity="many">Répéter dans <xliff:g id="minutes">%d</xliff:g> minutes.</item>
+        <item quantity="other">Répéter dans <xliff:g id="minutes">%d</xliff:g> minutes.</item>
     </plurals>
     <string name="alarm_alert_snooze_until" msgid="6958013659168344550">"Répétition jusqu\'à <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="alarm_alert_predismiss_title" msgid="5723945586913705445">"Alarme imminente"</string>
-    <string name="missed_alarm_has_been_deleted" msgid="5295473204045979335">"Votre alarme manquée a été supprimée."</string>
+    <string name="missed_alarm_has_been_deleted" msgid="5295473204045979335">Votre alarme manquée a été supprimée</string>
     <string name="timer_notifications_less_min" msgid="5481375048976427255">"Dans moins d\'une minute"</string>
-    <string name="timer_notifications_hours" msgid="1613266446037145138">"<xliff:g id="REMAINING"> %3$s</xliff:g> <xliff:g id="HOURS">%1$s</xliff:g>"</string>
-    <string name="timer_notifications_minutes" msgid="8543138714519498893">"<xliff:g id="REMAINING"> %3$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g>"</string>
-    <string name="timer_notifications_hours_minutes" msgid="4788475350933275505">"Il reste <xliff:g id="HOURS">%1$s</xliff:g> et <xliff:g id="MINUTES"> %2$s</xliff:g>."</string>
-    <string name="timer_notifications_seconds" msgid="122102514929728907">"<xliff:g id="SECONDS">%4$s</xliff:g> <xliff:g id="REMAINING"> %3$s</xliff:g>"</string>
-    <string name="timer_notifications_minutes_seconds" msgid="7059651926379491350">"<xliff:g id="MINUTES">%2$s</xliff:g> <xliff:g id="SECONDS"> %4$s</xliff:g> <xliff:g id="REMAINING"> %3$s</xliff:g>"</string>
-    <string name="timer_notifications_hours_seconds" msgid="8168090805113197804">"<xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="SECONDS"> %4$s</xliff:g> <xliff:g id="REMAINING"> %3$s</xliff:g>"</string>
-    <string name="timer_notifications_hours_minutes_seconds" msgid="4666176878038730417">"<xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES"> %2$s</xliff:g> <xliff:g id="SECONDS"> %4$s</xliff:g> <xliff:g id="REMAINING"> %3$s</xliff:g>"</string>
-    <string name="timer_accessibility_one_minute_added" msgid="6096646178998456004">"1 minute ajoutée au minuteur, <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="timer_accessibility_stopped" msgid="2753501043114605474">"Minuteur interrompu, <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="timer_accessibility_started" msgid="8503877052873671219">"Minuteur en cours, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="timer_notifications_hours" msgid="1613266446037145138"><xliff:g id="HOURS" example="2 hours">%1$s</xliff:g><xliff:g id="REMAINING" example="remaining"> %3$s</xliff:g></string>
+    <string name="timer_notifications_minutes" msgid="8543138714519498893"><xliff:g id="MINUTES" example="2 minutes">%2$s</xliff:g><xliff:g id="REMAINING" example="remaining"> %3$s</xliff:g></string>
+    <string name="timer_notifications_hours_minutes" msgid="4788475350933275505"><xliff:g id="HOURS" example="2 hours">%1$s</xliff:g><xliff:g id="MINUTES" example="2 minutes"> %2$s</xliff:g> restantes</string>
+    <string name="timer_notifications_seconds" msgid="122102514929728907"><xliff:g id="SECONDS" example="2 seconds">%4$s</xliff:g><xliff:g id="REMAINING" example="remaining"> %3$s</xliff:g></string>
+    <string name="timer_notifications_minutes_seconds" msgid="7059651926379491350"><xliff:g id="MINUTES" example="2 minutes">%2$s</xliff:g> <xliff:g id="SECONDS" example="2 seconds"> %4$s</xliff:g><xliff:g id="REMAINING" example="remaining"> %3$s</xliff:g></string>
+    <string name="timer_notifications_hours_seconds" msgid="8168090805113197804"><xliff:g id="HOURS" example="2 hours">%1$s</xliff:g> <xliff:g id="SECONDS" example="2 seconds"> %4$s</xliff:g><xliff:g id="REMAINING" example="remaining"> %3$s</xliff:g></string>
+    <string name="timer_notifications_hours_minutes_seconds" msgid="4666176878038730417"><xliff:g id="HOURS" example="2 hours">%1$s</xliff:g><xliff:g id="MINUTES" example="2 minutes"> %2$s</xliff:g><xliff:g id="SECONDS" example="2 seconds"> %4$s</xliff:g><xliff:g id="REMAINING" example="remaining"> %3$s</xliff:g></string>
+    <string name="timer_accessibility_one_minute_added" msgid="6096646178998456004">1 minute ajoutée au minuteur,<xliff:g id="TIME" example="5 hours remaining">%1$s</xliff:g></string>
+    <string name="timer_accessibility_stopped" msgid="2753501043114605474">Minuteur interrompu, <xliff:g id="TIME" example="5 hours remaining">%1$s</xliff:g></string>
+    <string name="timer_accessibility_started" msgid="8503877052873671219">Minuteur en cours, <xliff:g id="TIME" example="5 hours remaining">%1$s</xliff:g></string>
     <string name="timer_remaining_single" msgid="6782851171906765864">"Dans"</string>
     <string name="timer_remaining_multiple" msgid="6052775962092160851">"Dans"</string>
-  <string-array name="alarm_set">
-    <item msgid="6450913786084215050">"Prochaine alarme prévue dans moins d\'une minute."</item>
-    <item msgid="6002066367368421848">"Prochaine alarme prévue dans <xliff:g id="DAYS">%1$s</xliff:g>."</item>
-    <item msgid="8824719306247973774">"Prochaine alarme prévue dans <xliff:g id="HOURS">%2$s</xliff:g>."</item>
-    <item msgid="8182406852935468862">"Prochaine alarme prévue dans <xliff:g id="DAYS">%1$s</xliff:g> et <xliff:g id="HOURS">%2$s</xliff:g>."</item>
-    <item msgid="2532279224777213194">"Prochaine alarme prévue dans <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
-    <item msgid="5936557894247187717">"Prochaine alarme prévue dans <xliff:g id="DAYS">%1$s</xliff:g> et <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
-    <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-array name="alarm_set">
+        <item msgid="6450913786084215050">"Prochaine alarme prévue dans moins d\'une minute."</item>
+        <item msgid="6002066367368421848">"Prochaine alarme prévue dans <xliff:g id="DAYS">%1$s</xliff:g>."</item>
+        <item msgid="8824719306247973774">"Prochaine alarme prévue dans <xliff:g id="HOURS">%2$s</xliff:g>."</item>
+        <item msgid="8182406852935468862">"Prochaine alarme prévue dans <xliff:g id="DAYS">%1$s</xliff:g> et <xliff:g id="HOURS">%2$s</xliff:g>."</item>
+        <item msgid="2532279224777213194">"Prochaine alarme prévue dans <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
+        <item msgid="5936557894247187717">"Prochaine alarme prévue dans <xliff:g id="DAYS">%1$s</xliff:g> et <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
+        <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>
     <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>
+        <item quantity="one">1 jour</item>
+        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> jours</item>
+        <item quantity="other"><xliff:g id="number" example="7">%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>
+        <item quantity="one">1 heure</item>
+        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> heures</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> heures</item>
     </plurals>
     <plurals name="hours_short" formatted="false" msgid="3709250715691092925">
-      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> h</item>
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> h</item>
+        <item quantity="one">1h</item>
+        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> h</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> h</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>
+        <item quantity="one">1 minute</item>
+        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> minutes</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> minutes</item>
     </plurals>
     <plurals name="minutes_short" formatted="false" msgid="6397328304369080233">
-      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> min</item>
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> min</item>
+        <item quantity="one">1 min</item>
+        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> min</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> min</item>
     </plurals>
     <plurals name="seconds" formatted="false" msgid="670343577734266047">
-      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> seconde</item>
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> secondes</item>
+        <item quantity="one">1 seconde</item>
+        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> secondes</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> secondes</item>
     </plurals>
     <string name="every_day" msgid="4100909974923444602">"Tous les jours"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
@@ -109,87 +114,88 @@
     <string name="crescendo_duration_title" msgid="8606408542726189528">"Augmenter le volume progressivement"</string>
     <string name="auto_silence_title" msgid="2012754009554434544">"Arrêter la sonnerie après"</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>
+        <item quantity="one">1 minute</item>
+        <item quantity="many"><xliff:g id="formatted_number" example="7">%s</xliff:g> minutes</item>
+        <item quantity="other"><xliff:g id="formatted_number" example="7">%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>
-    <item msgid="5431906692406316549">"5 minutes"</item>
-    <item msgid="7742728812068919959">"10 minutes"</item>
-    <item msgid="2855948657259647629">"15 minutes"</item>
-    <item msgid="6330196381284475079">"20 minutes"</item>
-    <item msgid="7809240121716151904">"25 minutes"</item>
-    <item msgid="4278641338024561333">"Jamais"</item>
-  </string-array>
-  <string-array name="crescendo_entries">
-    <item msgid="7435149932182641128">"Désactivé"</item>
-    <item msgid="7195451681426992018">"5 secondes"</item>
-    <item msgid="592917601923801901">"10 secondes"</item>
-    <item msgid="5050318776687582653">"15 secondes"</item>
-    <item msgid="6997726466563948756">"20 secondes"</item>
-    <item msgid="1237360231425097772">"25 secondes"</item>
-    <item msgid="248014374051498284">"30 secondes"</item>
-    <item msgid="6110450211551791852">"35 secondes"</item>
-    <item msgid="8010211657612404516">"40 secondes"</item>
-    <item msgid="3730631498119797451">"45 secondes"</item>
-    <item msgid="623829984393124488">"50 secondes"</item>
-    <item msgid="6390209981529164605">"55 secondes"</item>
-    <item msgid="5261571706794132923">"60 secondes"</item>
-  </string-array>
-  <string-array name="snooze_duration_entries">
-    <item msgid="7668553664977446797">"1 minute"</item>
-    <item msgid="4482596794620161030">"2 minutes"</item>
-    <item msgid="8478276201849960314">"3 minutes"</item>
-    <item msgid="4038456474851212478">"4 minutes"</item>
-    <item msgid="6298175579152122770">"5 minutes"</item>
-    <item msgid="9021860177999278496">"6 minutes"</item>
-    <item msgid="7224689200902680256">"7 minutes"</item>
-    <item msgid="4610012663985162123">"8 minutes"</item>
-    <item msgid="1717028898015659426">"9 minutes"</item>
-    <item msgid="8058492636464337699">"10 minutes"</item>
-    <item msgid="577767219993868603">"11 minutes"</item>
-    <item msgid="3710047869487864775">"12 minutes"</item>
-    <item msgid="3794200935630619331">"13 minutes"</item>
-    <item msgid="5462266433522229437">"14 minutes"</item>
-    <item msgid="2192100038569306041">"15 minutes"</item>
-    <item msgid="6636326047858437620">"16 minutes"</item>
-    <item msgid="2481054808772108352">"17 minutes"</item>
-    <item msgid="4080984064428458050">"18 minutes"</item>
-    <item msgid="5844319398703041730">"19 minutes"</item>
-    <item msgid="2334964289857921073">"20 minutes"</item>
-    <item msgid="4755209855817904977">"21 minutes"</item>
-    <item msgid="8414394445389367355">"22 minutes"</item>
-    <item msgid="2604612428763230265">"23 minutes"</item>
-    <item msgid="6871696471373403806">"24 minutes"</item>
-    <item msgid="1573685398431466364">"25 minutes"</item>
-    <item msgid="6999090368236684971">"26 minutes"</item>
-    <item msgid="7125056720603734703">"27 minutes"</item>
-    <item msgid="1695830988496463030">"28 minutes"</item>
-    <item msgid="6706610539793025916">"29 minutes"</item>
-    <item msgid="2898212818965905529">"30 minutes"</item>
-  </string-array>
+    <string-array name="auto_silence_entries">
+        <item msgid="3024545954917711306">"Une minute"</item>
+        <item msgid="5431906692406316549">"5 minutes"</item>
+        <item msgid="7742728812068919959">"10 minutes"</item>
+        <item msgid="2855948657259647629">"15 minutes"</item>
+        <item msgid="6330196381284475079">"20 minutes"</item>
+        <item msgid="7809240121716151904">"25 minutes"</item>
+        <item msgid="4278641338024561333">"Jamais"</item>
+    </string-array>
+    <string-array name="crescendo_entries">
+        <item msgid="7435149932182641128">"Désactivé"</item>
+        <item msgid="7195451681426992018">"5 secondes"</item>
+        <item msgid="592917601923801901">"10 secondes"</item>
+        <item msgid="5050318776687582653">"15 secondes"</item>
+        <item msgid="6997726466563948756">"20 secondes"</item>
+        <item msgid="1237360231425097772">"25 secondes"</item>
+        <item msgid="248014374051498284">"30 secondes"</item>
+        <item msgid="6110450211551791852">"35 secondes"</item>
+        <item msgid="8010211657612404516">"40 secondes"</item>
+        <item msgid="3730631498119797451">"45 secondes"</item>
+        <item msgid="623829984393124488">"50 secondes"</item>
+        <item msgid="6390209981529164605">"55 secondes"</item>
+        <item msgid="5261571706794132923">"60 secondes"</item>
+    </string-array>
+    <string-array name="snooze_duration_entries">
+        <item msgid="7668553664977446797">"1 minute"</item>
+        <item msgid="4482596794620161030">"2 minutes"</item>
+        <item msgid="8478276201849960314">"3 minutes"</item>
+        <item msgid="4038456474851212478">"4 minutes"</item>
+        <item msgid="6298175579152122770">"5 minutes"</item>
+        <item msgid="9021860177999278496">"6 minutes"</item>
+        <item msgid="7224689200902680256">"7 minutes"</item>
+        <item msgid="4610012663985162123">"8 minutes"</item>
+        <item msgid="1717028898015659426">"9 minutes"</item>
+        <item msgid="8058492636464337699">"10 minutes"</item>
+        <item msgid="577767219993868603">"11 minutes"</item>
+        <item msgid="3710047869487864775">"12 minutes"</item>
+        <item msgid="3794200935630619331">"13 minutes"</item>
+        <item msgid="5462266433522229437">"14 minutes"</item>
+        <item msgid="2192100038569306041">"15 minutes"</item>
+        <item msgid="6636326047858437620">"16 minutes"</item>
+        <item msgid="2481054808772108352">"17 minutes"</item>
+        <item msgid="4080984064428458050">"18 minutes"</item>
+        <item msgid="5844319398703041730">"19 minutes"</item>
+        <item msgid="2334964289857921073">"20 minutes"</item>
+        <item msgid="4755209855817904977">"21 minutes"</item>
+        <item msgid="8414394445389367355">"22 minutes"</item>
+        <item msgid="2604612428763230265">"23 minutes"</item>
+        <item msgid="6871696471373403806">"24 minutes"</item>
+        <item msgid="1573685398431466364">"25 minutes"</item>
+        <item msgid="6999090368236684971">"26 minutes"</item>
+        <item msgid="7125056720603734703">"27 minutes"</item>
+        <item msgid="1695830988496463030">"28 minutes"</item>
+        <item msgid="6706610539793025916">"29 minutes"</item>
+        <item msgid="2898212818965905529">"30 minutes"</item>
+    </string-array>
     <string name="week_start_title" msgid="4268917518596832096">"Premier jour de la semaine"</string>
-  <string-array name="week_start_entries">
-    <item msgid="9010198173394482639">"Samedi"</item>
-    <item msgid="3993530639455360921">"Dimanche"</item>
-    <item msgid="8594709368683324282">"Lundi"</item>
-  </string-array>
+    <string-array name="week_start_entries">
+        <item msgid="9010198173394482639">"Samedi"</item>
+        <item msgid="3993530639455360921">"Dimanche"</item>
+        <item msgid="8594709368683324282">"Lundi"</item>
+    </string-array>
     <string name="alarm_volume_title" msgid="8506245173912428522">"Volume"</string>
     <string name="silent_ringtone_title" msgid="6177287302898634765">"Silencieux"</string>
     <string name="unknown_ringtone_title" msgid="6637522029614550112">"Inconnue"</string>
     <string name="alarm_volume_muted" msgid="6658289289695673569">"Volume de l\'alarme coupé"</string>
     <string name="unmute_alarm_volume" msgid="2655009276035357497">"Réactiver le son"</string>
-    <string name="silent_default_alarm_ringtone" msgid="6012855475009670997">"La sonnerie d\'alarme par défaut est silencieuse."</string>
+    <string name="silent_default_alarm_ringtone" msgid="6012855475009670997">L\'alarme par défaut est silencieuse</string>
     <string name="change_setting_action" msgid="1224356633832430160">"Modifier"</string>
     <string name="app_notifications_blocked" msgid="7249150789023936889">"Les notifications d\'horloge sont bloquées"</string>
-    <string name="alarms_blocked_by_dnd" msgid="6089433757505898969">"L\'appareil est défini sur \"Aucune interruption\"."</string>
+    <string name="alarms_blocked_by_dnd" msgid="6089433757505898969">L\'appareil est en mode \"Ne pas déranger\"</string>
     <string name="volume_button_setting_title" msgid="6937131248843413357">"Boutons du volume"</string>
-  <string-array name="volume_button_setting_entries">
-    <item msgid="7972756698723318690">"Répéter"</item>
-    <item msgid="3450979320164769576">"Ignorer"</item>
-    <item msgid="7085774139907653538">"Contrôler le volume"</item>
-  </string-array>
+    <string-array name="volume_button_setting_entries">
+        <item msgid="7972756698723318690">"Répéter"</item>
+        <item msgid="3450979320164769576">"Ignorer"</item>
+        <item msgid="7085774139907653538">"Contrôler le volume"</item>
+    </string-array>
     <string name="label_description" msgid="8736179296142915727">"Titre"</string>
     <string name="ringtone_description" msgid="7580922112921069925">"Sonnerie"</string>
     <string name="menu_alarm" msgid="4772010125376647519">"Alarme"</string>
@@ -213,16 +219,16 @@
     <string name="hours_label" msgid="3393478155635368097">"h"</string>
     <string name="minutes_label" msgid="3568098128251438588">"min"</string>
     <string name="seconds_label" msgid="124655952824003246">"s"</string>
-    <string name="timer_setup_description" msgid="2488277921227564704">"<xliff:g id="HOURS">%1$s</xliff:g>, <xliff:g id="MINUTES">%2$s</xliff:g>, <xliff:g id="SECONDS">%3$s</xliff:g>"</string>
+    <string name="timer_setup_description" msgid="2488277921227564704"><xliff:g id="hours" example="1 hour">%1$s</xliff:g>, <xliff:g id="minutes" example="15 minutes">%2$s</xliff:g>, <xliff:g id="seconds" example="30 seconds">%3$s</xliff:g></string>
     <string name="lap_number_single_digit" msgid="1051159504304610877">"Tour <xliff:g id="LAPNUMBER">%d</xliff:g>"</string>
     <string name="lap_number_double_digit" msgid="2138536756534362037">"Tour <xliff:g id="LAPNUMBER">%02d</xliff:g>"</string>
-    <string name="sw_share_main" msgid="7703563468204234405">"Mon heure est <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="sw_share_main" msgid="7703563468204234405">Mon chrono est de <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 name="timer_add_timer" msgid="862733633862574752">"Ajouter un minuteur"</string>
     <string name="timer_start" msgid="6158486445614356442">"Départ"</string>
     <string name="timer_delete" msgid="8699122001991909302">"Supprimer"</string>
-    <string name="timer_descriptive_delete" msgid="8794915342760383536">"Supprimer le numéro \"<xliff:g id="NUMBER_STRING">%s</xliff:g>\""</string>
+    <string name="timer_descriptive_delete" msgid="8794915342760383536">Supprimer <xliff:g id="number_string">%s</xliff:g></string>
     <string name="timer_plus_one" msgid="6631211310420106116">"Ajouter 1 minute"</string>
     <string name="timer_add_minute" msgid="207816824783281446">"+ 1:00"</string>
     <string name="timer_plus_1_min" msgid="8645224089494875062">"Ajouter 1 min"</string>
@@ -230,134 +236,134 @@
     <string name="timer_stop_all" msgid="9080780442843034376">"Arrêter tous les minuteurs"</string>
     <string name="timer_reset" msgid="7848424809190171640">"Réinitialiser"</string>
     <string name="timer_cancel" msgid="3572868404230815644">"Annuler"</string>
-    <string name="timer_canceled" msgid="7327923392567128060">"Le minuteur a été annulé."</string>
-    <string name="timer_times_up" msgid="9190440395938519009">"Le temps est écoulé."</string>
-    <string name="timer_multi_times_up" msgid="1239104626836080409">"<xliff:g id="NUM_TIMERS">%d</xliff:g> minuteurs ont expiré."</string>
-    <string name="timer_multi_missed" msgid="9085073572920385362">"<xliff:g id="NUMBER">%d</xliff:g> rappels manqués"</string>
+    <string name="timer_canceled" msgid="7327923392567128060">Minuteur annulé</string>
+    <string name="timer_times_up" msgid="9190440395938519009">Temps écoulé</string>
+    <string name="timer_multi_times_up" msgid="1239104626836080409"><xliff:g id="NUM_TIMERS" example="2">%d</xliff:g> minuteurs écoulés</string>
+    <string name="timer_multi_missed" msgid="9085073572920385362"><xliff:g id="number" example="2">%d</xliff:g> minuteurs manqués</string>
     <string name="timer_notification_label" msgid="4933184831583137249">"Minuteur"</string>
     <string name="missed_timer_notification_label" msgid="6661928727623284334">"Rappel manqué"</string>
-    <string name="missed_named_timer_notification_label" msgid="665604640028289175">"Rappel manqué : <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="missed_named_timer_notification_label" msgid="665604640028289175">Minuteur manqué : <xliff:g id="name" example="Pick up kids">%s</xliff:g></string>
     <string name="timer_pause" msgid="3748323712728398743">"Interrompre"</string>
     <string name="timer_reset_all" msgid="7530633132757866087">"Réinit. minuteurs"</string>
-    <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
-    <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
+    <string name="hours_minutes_seconds" msgid="5680088738059791288"><xliff:g id="hours" example="2">%1$d</xliff:g>:<xliff:g id="minutes" example="3">%2$02d</xliff:g>:<xliff:g id="seconds" example="44">%3$02d</xliff:g></string>
+    <string name="minutes_seconds" msgid="6189446107009577914"><xliff:g id="minutes" example="3">%1$d</xliff:g>:<xliff:g id="seconds" example="44">%2$02d</xliff:g></string>
     <!-- no translation found for seconds (6550091082396571898) -->
-    <skip />
-  <string-array name="sw_share_strings">
-    <item msgid="842841032273927988">"On peut dire que vous êtes rapide."</item>
-    <item msgid="6332879039890727169">"Profitez du fruit de votre travail."</item>
-    <item msgid="815382761274660130">"Les appareils Android sont connus pour leur rapidité, mais ils ne sont pas aussi rapides que vous !"</item>
-    <item msgid="7916250650982813737">"Ouf !"</item>
-    <item msgid="6836603904515182333">"Temps record !"</item>
-    <item msgid="7508085100680861631">"Quelle vitesse prodigieuse !"</item>
-    <item msgid="5961245252909589573">"Distorsion temporelle"</item>
-    <item msgid="5211891900854545940">"Un bond vers la gauche"</item>
-    <item msgid="9071353477103826053">"Quoi qu\'il arrive, vous n\'êtes jamais en retard."</item>
-    <item msgid="3785193933691117181">"Vitesse photonique"</item>
-  </string-array>
+    <skip/>
+    <string-array name="sw_share_strings">
+        <item msgid="842841032273927988">"On peut dire que vous êtes rapide."</item>
+        <item msgid="6332879039890727169">"Profitez du fruit de votre travail."</item>
+        <item msgid="815382761274660130">"Les appareils Android sont connus pour leur rapidité, mais ils ne sont pas aussi rapides que vous !"</item>
+        <item msgid="7916250650982813737">"Ouf !"</item>
+        <item msgid="6836603904515182333">"Temps record !"</item>
+        <item msgid="7508085100680861631">"Quelle vitesse prodigieuse !"</item>
+        <item msgid="5961245252909589573">"Distorsion temporelle"</item>
+        <item msgid="5211891900854545940">"Un bond vers la gauche"</item>
+        <item msgid="9071353477103826053">"Quoi qu\'il arrive, vous n\'êtes jamais en retard."</item>
+        <item msgid="3785193933691117181">"Vitesse photonique"</item>
+    </string-array>
     <string name="home_label" msgid="4436139365695453870">"Domicile"</string>
     <string name="cities_activity_title" msgid="8552462751129256730">"Villes"</string>
     <string name="clock_settings" msgid="8317286807280600391">"Horloge"</string>
     <string name="clock_style" msgid="2265011060429742344">"Style"</string>
     <string name="display_clock_seconds_pref" msgid="691506643469501643">"Afficher l\'heure avec les secondes"</string>
     <string name="open_date_settings" msgid="7712226973337806152">"Modifier la date et l\'heure"</string>
-  <string-array name="clock_style_entries">
-    <item msgid="917900462224167608">"Analogique"</item>
-    <item msgid="8483930821046925592">"Numérique"</item>
-  </string-array>
+    <string-array name="clock_style_entries">
+        <item msgid="917900462224167608">"Analogique"</item>
+        <item msgid="8483930821046925592">"Numérique"</item>
+    </string-array>
     <string name="automatic_home_clock" msgid="6274174710735449252">"Horloge avec heure du domicile"</string>
-    <string name="automatic_home_clock_summary" msgid="6020476321040807273">"Lors de vos déplacements dans des régions où le fuseau horaire est différent, ajoutez une horloge pour connaître l\'heure de votre domicile."</string>
+    <string name="automatic_home_clock_summary" msgid="6020476321040807273">Lors de vos déplacements dans des régions où le fuseau horaire est différent, ajoutez une horloge pour connaître l\'heure de votre domicile.</string>
     <string name="home_time_zone" msgid="9199730676287974501">"Mon fuseau horaire"</string>
     <string name="home_time_zone_title" msgid="807894493443834624">"Mon fuseau horaire"</string>
-    <string name="city_checked" msgid="616847871968019">"Case \"<xliff:g id="CITY_NAME">%s</xliff:g>\" cochée"</string>
-    <string name="city_unchecked" msgid="710212932781145918">"Case \"<xliff:g id="CITY_NAME">%s</xliff:g>\" décochée"</string>
-  <string-array name="timezone_labels">
-    <item msgid="5495601234086197399">"Îles Marshall"</item>
-    <item msgid="4196408495909011020">"Atoll de Midway"</item>
-    <item msgid="1414384194857730006">"Hawaï"</item>
-    <item msgid="2687091371581931926">"Alaska"</item>
-    <item msgid="1922100269679049660">"Heure du Pacifique"</item>
-    <item msgid="7156402158716866161">"Tijuana"</item>
-    <item msgid="1144117502254612241">"Arizona"</item>
-    <item msgid="101284182011722637">"Chihuahua"</item>
-    <item msgid="689121094232986897">"Montagnes Rocheuses"</item>
-    <item msgid="5445331923942302756">"Amérique centrale"</item>
-    <item msgid="2749806434052452351">"Centre"</item>
-    <item msgid="3997138870229703753">"Mexico"</item>
-    <item msgid="5425567073027744888">"Saskatchewan"</item>
-    <item msgid="2877342865396629368">"Bogota"</item>
-    <item msgid="568682398893899670">"Est"</item>
-    <item msgid="668135984541863866">"Venezuela"</item>
-    <item msgid="3737474220861486223">"Atlantique (la Barbade)"</item>
-    <item msgid="6279116051273436870">"Atlantique (Canada)"</item>
-    <item msgid="8513382867172014244">"Manaus"</item>
-    <item msgid="7776299003105932407">"Santiago"</item>
-    <item msgid="8636989494746218677">"Terre-Neuve-et-Labrador"</item>
-    <item msgid="4402541016410147505">"Brasilia"</item>
-    <item msgid="2251184440733164084">"Buenos Aires"</item>
-    <item msgid="6202926618569004969">"Groenland"</item>
-    <item msgid="2355275037115290628">"Montevideo"</item>
-    <item msgid="1377549694711708945">"États du Mid-Atlantic"</item>
-    <item msgid="3457671272126347981">"Açores"</item>
-    <item msgid="3659315141063710840">"Cap-Vert"</item>
-    <item msgid="1260941741802367635">"Casablanca"</item>
-    <item msgid="8275203689687954762">"Londres, Dublin"</item>
-    <item msgid="5970179539479320905">"Amsterdam, Berlin"</item>
-    <item msgid="5396319478750517962">"Belgrade"</item>
-    <item msgid="8688787475056663004">"Bruxelles"</item>
-    <item msgid="3415827874921681622">"Sarajevo"</item>
-    <item msgid="402008965928320066">"Windhoek"</item>
-    <item msgid="6436942724959275569">"Afrique occidentale"</item>
-    <item msgid="954536568417204026">"Amman, Jordanie"</item>
-    <item msgid="8932745482008902551">"Athènes, Istanbul"</item>
-    <item msgid="320025725949024510">"Beyrouth, Liban"</item>
-    <item msgid="7242083112551905970">"Le Caire"</item>
-    <item msgid="7241520146011450419">"Helsinki"</item>
-    <item msgid="2717065017510546526">"Jérusalem"</item>
-    <item msgid="8698556287741466553">"Minsk"</item>
-    <item msgid="1797598357342084506">"Harare"</item>
-    <item msgid="5169119919905066998">"Bagdad"</item>
-    <item msgid="2615788116201065182">"Moscou"</item>
-    <item msgid="9084354867885584646">"Koweït"</item>
-    <item msgid="1351570519986178268">"Nairobi"</item>
-    <item msgid="7094569580635877460">"Téhéran"</item>
-    <item msgid="3953138772617909704">"Baku"</item>
-    <item msgid="2868893113598800752">"Tbilissi"</item>
-    <item msgid="7088581865802476373">"Erevan"</item>
-    <item msgid="1941122257623887992">"Dubaï"</item>
-    <item msgid="9194797225058249720">"Kaboul"</item>
-    <item msgid="6486569254364577332">"Islamabad, Karachi"</item>
-    <item msgid="5487724896895412089">"Ouralsk"</item>
-    <item msgid="364906869710826982">"Ekaterinbourg"</item>
-    <item msgid="2106505051751383358">"Calcutta"</item>
-    <item msgid="6851586621581501447">"Sri Lanka"</item>
-    <item msgid="800438544128213134">"Katmandou"</item>
-    <item msgid="6173621471007643021">"Astana"</item>
-    <item msgid="8645125891971581128">"Yangon"</item>
-    <item msgid="2886407505119737794">"Krasnoïarsk"</item>
-    <item msgid="3408222398188107090">"Bangkok"</item>
-    <item msgid="4441612937172851228">"Beijing"</item>
-    <item msgid="4936715789028996930">"Hong Kong"</item>
-    <item msgid="4261031143777385525">"Irkoutsk"</item>
-    <item msgid="3538060959338191835">"Kuala Lumpur"</item>
-    <item msgid="1438847562643099201">"Perth"</item>
-    <item msgid="3063913827688244383">"Taipei"</item>
-    <item msgid="3502757135046564209">"Séoul"</item>
-    <item msgid="6107588684519111669">"Tokyo, Osaka"</item>
-    <item msgid="4350769099755608471">"Iakoutsk"</item>
-    <item msgid="2422707004533526462">"Adélaïde"</item>
-    <item msgid="1292192084554134339">"Darwin"</item>
-    <item msgid="1320883699470001716">"Brisbane"</item>
-    <item msgid="5137198806146386527">"Hobart"</item>
-    <item msgid="5920063686933941174">"Sydney, Canberra"</item>
-    <item msgid="615906039696009425">"Vladivostok"</item>
-    <item msgid="7738680449356275374">"Guam"</item>
-    <item msgid="2882915026380778227">"Magadan"</item>
-    <item msgid="8255615641810148152">"Auckland"</item>
-    <item msgid="3027153773466391728">"Fidji"</item>
-    <item msgid="5911600083231840181">"Tonga"</item>
-    <item msgid="5176858645450908751">"Jakarta"</item>
-  </string-array>
+    <string name="city_checked" msgid="616847871968019"><xliff:g id="city_name">%s</xliff:g> cochée</string>
+    <string name="city_unchecked" msgid="710212932781145918"><xliff:g id="city_name">%s</xliff:g> non cochée</string>
+    <string-array name="timezone_labels">
+        <item msgid="5495601234086197399">"Îles Marshall"</item>
+        <item msgid="4196408495909011020">"Atoll de Midway"</item>
+        <item msgid="1414384194857730006">"Hawaï"</item>
+        <item msgid="2687091371581931926">"Alaska"</item>
+        <item msgid="1922100269679049660">"Heure du Pacifique"</item>
+        <item msgid="7156402158716866161">"Tijuana"</item>
+        <item msgid="1144117502254612241">"Arizona"</item>
+        <item msgid="101284182011722637">"Chihuahua"</item>
+        <item msgid="689121094232986897">"Montagnes Rocheuses"</item>
+        <item msgid="5445331923942302756">"Amérique centrale"</item>
+        <item msgid="2749806434052452351">"Centre"</item>
+        <item msgid="3997138870229703753">"Mexico"</item>
+        <item msgid="5425567073027744888">"Saskatchewan"</item>
+        <item msgid="2877342865396629368">"Bogota"</item>
+        <item msgid="568682398893899670">"Est"</item>
+        <item msgid="668135984541863866">"Venezuela"</item>
+        <item msgid="3737474220861486223">"Atlantique (la Barbade)"</item>
+        <item msgid="6279116051273436870">"Atlantique (Canada)"</item>
+        <item msgid="8513382867172014244">"Manaus"</item>
+        <item msgid="7776299003105932407">"Santiago"</item>
+        <item msgid="8636989494746218677">"Terre-Neuve-et-Labrador"</item>
+        <item msgid="4402541016410147505">"Brasilia"</item>
+        <item msgid="2251184440733164084">"Buenos Aires"</item>
+        <item msgid="6202926618569004969">"Groenland"</item>
+        <item msgid="2355275037115290628">"Montevideo"</item>
+        <item msgid="1377549694711708945">"États du Mid-Atlantic"</item>
+        <item msgid="3457671272126347981">"Açores"</item>
+        <item msgid="3659315141063710840">"Cap-Vert"</item>
+        <item msgid="1260941741802367635">"Casablanca"</item>
+        <item msgid="8275203689687954762">"Londres, Dublin"</item>
+        <item msgid="5970179539479320905">"Amsterdam, Berlin"</item>
+        <item msgid="5396319478750517962">"Belgrade"</item>
+        <item msgid="8688787475056663004">"Bruxelles"</item>
+        <item msgid="3415827874921681622">"Sarajevo"</item>
+        <item msgid="402008965928320066">"Windhoek"</item>
+        <item msgid="6436942724959275569">"Afrique occidentale"</item>
+        <item msgid="954536568417204026">"Amman, Jordanie"</item>
+        <item msgid="8932745482008902551">"Athènes, Istanbul"</item>
+        <item msgid="320025725949024510">"Beyrouth, Liban"</item>
+        <item msgid="7242083112551905970">"Le Caire"</item>
+        <item msgid="7241520146011450419">"Helsinki"</item>
+        <item msgid="2717065017510546526">"Jérusalem"</item>
+        <item msgid="8698556287741466553">"Minsk"</item>
+        <item msgid="1797598357342084506">"Harare"</item>
+        <item msgid="5169119919905066998">"Bagdad"</item>
+        <item msgid="2615788116201065182">"Moscou"</item>
+        <item msgid="9084354867885584646">"Koweït"</item>
+        <item msgid="1351570519986178268">"Nairobi"</item>
+        <item msgid="7094569580635877460">"Téhéran"</item>
+        <item msgid="3953138772617909704">"Baku"</item>
+        <item msgid="2868893113598800752">"Tbilissi"</item>
+        <item msgid="7088581865802476373">"Erevan"</item>
+        <item msgid="1941122257623887992">"Dubaï"</item>
+        <item msgid="9194797225058249720">"Kaboul"</item>
+        <item msgid="6486569254364577332">"Islamabad, Karachi"</item>
+        <item msgid="5487724896895412089">"Ouralsk"</item>
+        <item msgid="364906869710826982">"Ekaterinbourg"</item>
+        <item msgid="2106505051751383358">"Calcutta"</item>
+        <item msgid="6851586621581501447">"Sri Lanka"</item>
+        <item msgid="800438544128213134">"Katmandou"</item>
+        <item msgid="6173621471007643021">"Astana"</item>
+        <item msgid="8645125891971581128">"Yangon"</item>
+        <item msgid="2886407505119737794">"Krasnoïarsk"</item>
+        <item msgid="3408222398188107090">"Bangkok"</item>
+        <item msgid="4441612937172851228">"Beijing"</item>
+        <item msgid="4936715789028996930">"Hong Kong"</item>
+        <item msgid="4261031143777385525">"Irkoutsk"</item>
+        <item msgid="3538060959338191835">"Kuala Lumpur"</item>
+        <item msgid="1438847562643099201">"Perth"</item>
+        <item msgid="3063913827688244383">"Taipei"</item>
+        <item msgid="3502757135046564209">"Séoul"</item>
+        <item msgid="6107588684519111669">"Tokyo, Osaka"</item>
+        <item msgid="4350769099755608471">"Iakoutsk"</item>
+        <item msgid="2422707004533526462">"Adélaïde"</item>
+        <item msgid="1292192084554134339">"Darwin"</item>
+        <item msgid="1320883699470001716">"Brisbane"</item>
+        <item msgid="5137198806146386527">"Hobart"</item>
+        <item msgid="5920063686933941174">"Sydney, Canberra"</item>
+        <item msgid="615906039696009425">"Vladivostok"</item>
+        <item msgid="7738680449356275374">"Guam"</item>
+        <item msgid="2882915026380778227">"Magadan"</item>
+        <item msgid="8255615641810148152">"Auckland"</item>
+        <item msgid="3027153773466391728">"Fidji"</item>
+        <item msgid="5911600083231840181">"Tonga"</item>
+        <item msgid="5176858645450908751">"Jakarta"</item>
+    </string-array>
     <string name="shortcut_new_alarm_short" msgid="3490418929139725538">"Nouvelle alarme"</string>
     <string name="shortcut_new_alarm_long" msgid="4778064830147981089">"Créer une alarme"</string>
     <string name="shortcut_new_timer_short" msgid="3793414543219297884">"Nouveau minuteur"</string>
@@ -378,10 +384,10 @@
     <string name="timer_settings" msgid="7955522143086154795">"Minuteurs"</string>
     <string name="timer_vibrate_title" msgid="7788920024785587518">"Minuteur en mode vibreur"</string>
     <string name="timer_paused" msgid="5941160896040771462">"Minuteur interrompu"</string>
-    <string name="timers_stopped" msgid="3186191253226005149">"<xliff:g id="NUMBER">%d</xliff:g> minuteurs interrompus"</string>
-    <string name="all_timers_stopped_notif" msgid="883027111895833440">"Appuyez pour afficher vos minuteurs."</string>
-    <string name="timers_in_use" msgid="5570729467344408506">"<xliff:g id="NUMBER">%d</xliff:g> minuteurs"</string>
-    <string name="next_timer_notif" msgid="6136454740115613653">"Minuteur suivant : <xliff:g id="TIME_REMAINING">%s</xliff:g>"</string>
+    <string name="timers_stopped" msgid="3186191253226005149"><xliff:g id="number" example="7">%d</xliff:g> minuteurs interrompus</string>
+    <string name="all_timers_stopped_notif" msgid="883027111895833440">Appuyez pour afficher vos minuteurs</string>
+    <string name="timers_in_use" msgid="5570729467344408506"><xliff:g id="number" example="7">%d</xliff:g> minuteurs</string>
+    <string name="next_timer_notif" msgid="6136454740115613653">Minuteur suivant :<xliff:g id="time_remaining" example="2 minutes remaining">%s</xliff:g></string>
     <string name="screensaver_settings" msgid="1780742944194267226">"Paramètres de l\'économiseur d\'écran"</string>
     <string name="night_mode_title" msgid="5983813889469616299">"Mode Nuit"</string>
     <string name="night_mode_summary" msgid="1017350187324162631">"Affichage peu lumineux (pour les pièces sombres)"</string>
@@ -389,37 +395,38 @@
     <string name="collapse_alarm" msgid="3561772046433483980">"Réduire l\'alarme"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"Annuler"</string>
     <string name="alarm_deleted" msgid="6131529309389084785">"Alarme supprimée"</string>
-    <string name="world_day_of_week_label" msgid="5911196322328341288">"/<xliff:g id="LABEL">%s</xliff:g>"</string>
-    <string name="world_time_ahead" msgid="625559988238637652">"<xliff:g id="TIME">%1$s</xliff:g> de plus"</string>
-    <string name="world_time_behind" msgid="5395771290726167865">"<xliff:g id="TIME">%1$s</xliff:g> de moins"</string>
-    <string name="world_hours_minutes_ahead" msgid="5132012793021696377">"<xliff:g id="HOURS">%1$s</xliff:g> et <xliff:g id="MINUTES">%2$s</xliff:g> de plus"</string>
-    <string name="world_hours_minutes_behind" msgid="8978567362140923698">"<xliff:g id="HOURS">%1$s</xliff:g> et <xliff:g id="MINUTES">%2$s</xliff:g> de moins"</string>
-    <string name="world_hours_tomorrow" msgid="2504465609269004794">"J+1, <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="world_hours_yesterday" msgid="4425086322610882745">"Hier, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="world_day_of_week_label" msgid="5911196322328341288"> / <xliff:g id="label">%s</xliff:g></string>
+    <string name="world_time_ahead" msgid="625559988238637652"><xliff:g id="time" example="6 hours">%1$s</xliff:g> de plus</string>
+    <string name="world_time_behind" msgid="5395771290726167865"><xliff:g id="time" example="4 hours">%1$s</xliff:g> de moins</string>
+    <string name="world_hours_minutes_ahead" msgid="5132012793021696377"><xliff:g id="hours" example="6 hr">%1$s</xliff:g> <xliff:g id="minutes" example="30 min">%2$s</xliff:g> de plus</string>
+    <string name="world_hours_minutes_behind" msgid="8978567362140923698"><xliff:g id="hours" example="4 hr">%1$s</xliff:g> <xliff:g id="minutes" example="30 min">%2$s</xliff:g> de moins</string>
+    <string name="world_hours_tomorrow" msgid="2504465609269004794">Demain, <xliff:g id="time" example="6 hours ahead">%1$s</xliff:g></string>
+    <string name="world_hours_yesterday" msgid="4425086322610882745">Hier, <xliff:g id="time" example="4 hours behind">%1$s</xliff:g></string>
     <string name="world_tomorrow" msgid="7633067935455580920">"Demain"</string>
     <string name="world_yesterday" msgid="5430990920477833164">"Hier"</string>
-    <string name="next_alarm_description" msgid="2650244835760747046">"Prochaine alarme : <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
+    <string name="next_alarm_description" msgid="2650244835760747046">Prochaine alarme : <xliff:g id="alarm_time" example="Wed 8:00am">%s</xliff:g></string>
     <string name="no_alarms" msgid="6429431324842022917">"Aucune alarme"</string>
-    <string name="invalid_time" msgid="2782334750243998633">"Heure non valide <xliff:g id="INVALID_HOUR">%1$d</xliff:g>:<xliff:g id="INVALID_MINUTES">%2$d</xliff:g> <xliff:g id="INVALID_AMPM">%3$s</xliff:g>"</string>
-    <string name="no_alarm_at" msgid="8140632482969193119">"Aucune alarme définie à <xliff:g id="ALARM_TIME_HOUR">%1$d</xliff:g>:<xliff:g id="ALARM_TIME_MINUTES">%2$d</xliff:g>."</string>
-    <string name="no_scheduled_alarms" msgid="2115420148192753534">"Aucune alarme n\'est programmée."</string>
-    <string name="no_label_specified" msgid="2008482054428460626">"Aucun libellé spécifié."</string>
+    <string name="invalid_time" msgid="2782334750243998633">Heure invalide <xliff:g id="invalid_hour" example="25">%1$d</xliff:g>:<xliff:g id="invalid_minutes" example="63">%2$d</xliff:g> <xliff:g id="invalid_ampm" example="PM">%3$s</xliff:g></string>
+    <string name="no_alarm_at" msgid="8140632482969193119">Pas d\'alarme programmée à <xliff:g id="alarm_time_hour" example="14">%1$d</xliff:g>:<xliff:g id="alarm_time_minutes" example="23">%2$d</xliff:g></string>
+    <string name="no_scheduled_alarms" msgid="2115420148192753534">Aucune alarme n\'est programmée</string>
+    <string name="no_label_specified" msgid="2008482054428460626">Aucun titre spécifié</string>
     <string name="no_alarms_with_label" msgid="6250998794542941665">"Aucune alarme ne comporte le libellé"</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>
-    <string name="alarm_is_set" msgid="5503226382620011088">"Alarme à <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
-    <string name="timer_created" msgid="4381027137335885547">"Le minuteur a bien été créé."</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">Alarme de <xliff:g id="alarm_time" example="14:20">%s</xliff:g> ignorée</string>
+    <string name="alarm_is_set" msgid="5503226382620011088">Alarme programmée à <xliff:g id="alarm_time" example="14:20">%s</xliff:g></string>
+    <string name="timer_created" msgid="4381027137335885547">Le minuteur a bien été créé</string>
     <plurals name="expired_timers_dismissed" formatted="false" msgid="1294953410988488149">
-      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> minuteur ignoré</item>
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minuteurs ignorés</item>
+        <item quantity="one">1 minuteur ignoré</item>
+        <item quantity="many"><xliff:g id="number" example="5">%d</xliff:g> minuteurs ignorés</item>
+        <item quantity="other"><xliff:g id="number" example="5">%d</xliff:g> minuteurs ignorés</item>
     </plurals>
-    <string name="timer_deleted" msgid="9110322362460029392">"Le minuteur a été supprimé."</string>
-    <string name="invalid_timer_length" msgid="3104567893212932487">"Durée de minuteur incorrecte."</string>
+    <string name="timer_deleted" msgid="9110322362460029392">Le minuteur a été supprimé</string>
+    <string name="invalid_timer_length" msgid="3104567893212932487">Durée de minuteur incorrecte</string>
     <string name="invalid_timer" msgid="900957020728335675">"Minuteur non valide sélectionné"</string>
     <string name="no_expired_timers" msgid="4624192298397846876">"Aucun minuteur expiré"</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="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">Impossible d\'ignorer l\'alarme de <xliff:g id="alarm_time" example="14:20">%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>
+    <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 déclenchée</string>
+    <string name="alarm_is_snoozed" msgid="7044644119744928846">Alarme de <xliff:g id="alarm_time" example="14:20">%s</xliff:g> reportée dans 10 minutes</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2b0d75b5e..d86bc5d28 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- 
   Copyright (C) 2016 The Android Open Source Project
 
@@ -13,10 +13,7 @@
   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.
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+   --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="6674495003718166674">"Orologio"</string>
     <string name="label" msgid="162189613902857319">"Etichetta"</string>
     <string name="default_label" msgid="5590025289805630372">"Sveglia"</string>
@@ -40,14 +37,15 @@
     <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
     <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Posticip."</string>
     <plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
-      <item quantity="one">1 min</item>
+        <item quantity="one">1 min</item>
+        <item quantity="many"><xliff:g id="number" example="7">%d</xliff:g> min</item>
+        <item quantity="other"></item>
     </plurals>
     <string name="alarm_alert_off_text" msgid="4472073417593915002">"Sveglia off"</string>
     <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Posticipa"</string>
     <plurals name="alarm_alert_snooze_set" formatted="false" msgid="3212729193036041768">
-      <item quantity="other">Posticipazione di <xliff:g id="MINUTES">%d</xliff:g> minuti.</item>
-      <item quantity="one">Posticipazione di un minuto.</item>
+        <item quantity="other">Posticipazione di <xliff:g id="MINUTES">%d</xliff:g> minuti.</item>
+        <item quantity="one">Posticipazione di un minuto.</item>
     </plurals>
     <string name="alarm_alert_snooze_until" msgid="6958013659168344550">"Posticipa a <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="alarm_alert_predismiss_title" msgid="5723945586913705445">"Prossima sveglia"</string>
@@ -65,39 +63,44 @@
     <string name="timer_accessibility_started" msgid="8503877052873671219">"Timer in esecuzione, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="timer_remaining_single" msgid="6782851171906765864">"rimanente"</string>
     <string name="timer_remaining_multiple" msgid="6052775962092160851">"rimanenti"</string>
-  <string-array name="alarm_set">
-    <item msgid="6450913786084215050">"La sveglia sarà attivata tra meno di 1 minuto."</item>
-    <item msgid="6002066367368421848">"La sveglia sarà attivata tra <xliff:g id="DAYS">%1$s</xliff:g>."</item>
-    <item msgid="8824719306247973774">"La sveglia sarà attivata tra <xliff:g id="HOURS">%2$s</xliff:g>."</item>
-    <item msgid="8182406852935468862">"La sveglia sarà attivata tra <xliff:g id="DAYS">%1$s</xliff:g> e <xliff:g id="HOURS">%2$s</xliff:g>."</item>
-    <item msgid="2532279224777213194">"La sveglia sarà attivata tra <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
-    <item msgid="5936557894247187717">"La sveglia sarà attivata tra <xliff:g id="DAYS">%1$s</xliff:g> e <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
-    <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-array name="alarm_set">
+        <item msgid="6450913786084215050">"La sveglia sarà attivata tra meno di 1 minuto."</item>
+        <item msgid="6002066367368421848">"La sveglia sarà attivata tra <xliff:g id="DAYS">%1$s</xliff:g>."</item>
+        <item msgid="8824719306247973774">"La sveglia sarà attivata tra <xliff:g id="HOURS">%2$s</xliff:g>."</item>
+        <item msgid="8182406852935468862">"La sveglia sarà attivata tra <xliff:g id="DAYS">%1$s</xliff:g> e <xliff:g id="HOURS">%2$s</xliff:g>."</item>
+        <item msgid="2532279224777213194">"La sveglia sarà attivata tra <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
+        <item msgid="5936557894247187717">"La sveglia sarà attivata tra <xliff:g id="DAYS">%1$s</xliff:g> e <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
+        <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>
     <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>
+        <item quantity="one">1 giorno</item>
+        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> giorni</item>
+        <item quantity="other"></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>
+        <item quantity="one">1 ora</item>
+        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> ore</item>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="hours_short" formatted="false" msgid="3709250715691092925">
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ore</item>
-      <item quantity="one">1 ora</item>
+        <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>
+        <item quantity="one">1 minuto</item>
+        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> minuti</item>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="minutes_short" formatted="false" msgid="6397328304369080233">
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuti</item>
-      <item quantity="one">1 minuto</item>
+        <item quantity="one">1 min</item>
+        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> min</item>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="seconds" formatted="false" msgid="670343577734266047">
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> secondi</item>
-      <item quantity="one">1 secondo</item>
+        <item quantity="one">1 secondo</item>
+        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> secondi</item>
+        <item quantity="other"></item>
     </plurals>
     <string name="every_day" msgid="4100909974923444602">"Ogni giorno"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
@@ -109,72 +112,73 @@
     <string name="crescendo_duration_title" msgid="8606408542726189528">"Aumenta gradualmente il volume"</string>
     <string name="auto_silence_title" msgid="2012754009554434544">"Disattiva suoneria dopo"</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>
+        <item quantity="one">1 minuto</item>
+        <item quantity="many"><xliff:g id="formatted_number" example="7">%s</xliff:g> minuti</item>
+        <item quantity="other"></item>
     </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Mai"</string>
-  <string-array name="auto_silence_entries">
-    <item msgid="3024545954917711306">"1 minuto"</item>
-    <item msgid="5431906692406316549">"5 minuti"</item>
-    <item msgid="7742728812068919959">"10 minuti"</item>
-    <item msgid="2855948657259647629">"15 minuti"</item>
-    <item msgid="6330196381284475079">"20 minuti"</item>
-    <item msgid="7809240121716151904">"25 minuti"</item>
-    <item msgid="4278641338024561333">"Mai"</item>
-  </string-array>
-  <string-array name="crescendo_entries">
-    <item msgid="7435149932182641128">"Off"</item>
-    <item msgid="7195451681426992018">"5 secondi"</item>
-    <item msgid="592917601923801901">"10 secondi"</item>
-    <item msgid="5050318776687582653">"15 secondi"</item>
-    <item msgid="6997726466563948756">"20 secondi"</item>
-    <item msgid="1237360231425097772">"25 secondi"</item>
-    <item msgid="248014374051498284">"30 secondi"</item>
-    <item msgid="6110450211551791852">"35 secondi"</item>
-    <item msgid="8010211657612404516">"40 secondi"</item>
-    <item msgid="3730631498119797451">"45 secondi"</item>
-    <item msgid="623829984393124488">"50 secondi"</item>
-    <item msgid="6390209981529164605">"55 secondi"</item>
-    <item msgid="5261571706794132923">"60 secondi"</item>
-  </string-array>
-  <string-array name="snooze_duration_entries">
-    <item msgid="7668553664977446797">"1 minuto"</item>
-    <item msgid="4482596794620161030">"2 minuti"</item>
-    <item msgid="8478276201849960314">"3 minuti"</item>
-    <item msgid="4038456474851212478">"4 minuti"</item>
-    <item msgid="6298175579152122770">"5 minuti"</item>
-    <item msgid="9021860177999278496">"6 minuti"</item>
-    <item msgid="7224689200902680256">"7 minuti"</item>
-    <item msgid="4610012663985162123">"8 minuti"</item>
-    <item msgid="1717028898015659426">"9 minuti"</item>
-    <item msgid="8058492636464337699">"10 minuti"</item>
-    <item msgid="577767219993868603">"11 minuti"</item>
-    <item msgid="3710047869487864775">"12 minuti"</item>
-    <item msgid="3794200935630619331">"13 minuti"</item>
-    <item msgid="5462266433522229437">"14 minuti"</item>
-    <item msgid="2192100038569306041">"15 minuti"</item>
-    <item msgid="6636326047858437620">"16 minuti"</item>
-    <item msgid="2481054808772108352">"17 minuti"</item>
-    <item msgid="4080984064428458050">"18 minuti"</item>
-    <item msgid="5844319398703041730">"19 minuti"</item>
-    <item msgid="2334964289857921073">"20 minuti"</item>
-    <item msgid="4755209855817904977">"21 minuti"</item>
-    <item msgid="8414394445389367355">"22 minuti"</item>
-    <item msgid="2604612428763230265">"23 minuti"</item>
-    <item msgid="6871696471373403806">"24 minuti"</item>
-    <item msgid="1573685398431466364">"25 minuti"</item>
-    <item msgid="6999090368236684971">"26 minuti"</item>
-    <item msgid="7125056720603734703">"27 minuti"</item>
-    <item msgid="1695830988496463030">"28 minuti"</item>
-    <item msgid="6706610539793025916">"29 minuti"</item>
-    <item msgid="2898212818965905529">"30 minuti"</item>
-  </string-array>
+    <string-array name="auto_silence_entries">
+        <item msgid="3024545954917711306">"1 minuto"</item>
+        <item msgid="5431906692406316549">"5 minuti"</item>
+        <item msgid="7742728812068919959">"10 minuti"</item>
+        <item msgid="2855948657259647629">"15 minuti"</item>
+        <item msgid="6330196381284475079">"20 minuti"</item>
+        <item msgid="7809240121716151904">"25 minuti"</item>
+        <item msgid="4278641338024561333">"Mai"</item>
+    </string-array>
+    <string-array name="crescendo_entries">
+        <item msgid="7435149932182641128">"Off"</item>
+        <item msgid="7195451681426992018">"5 secondi"</item>
+        <item msgid="592917601923801901">"10 secondi"</item>
+        <item msgid="5050318776687582653">"15 secondi"</item>
+        <item msgid="6997726466563948756">"20 secondi"</item>
+        <item msgid="1237360231425097772">"25 secondi"</item>
+        <item msgid="248014374051498284">"30 secondi"</item>
+        <item msgid="6110450211551791852">"35 secondi"</item>
+        <item msgid="8010211657612404516">"40 secondi"</item>
+        <item msgid="3730631498119797451">"45 secondi"</item>
+        <item msgid="623829984393124488">"50 secondi"</item>
+        <item msgid="6390209981529164605">"55 secondi"</item>
+        <item msgid="5261571706794132923">"60 secondi"</item>
+    </string-array>
+    <string-array name="snooze_duration_entries">
+        <item msgid="7668553664977446797">"1 minuto"</item>
+        <item msgid="4482596794620161030">"2 minuti"</item>
+        <item msgid="8478276201849960314">"3 minuti"</item>
+        <item msgid="4038456474851212478">"4 minuti"</item>
+        <item msgid="6298175579152122770">"5 minuti"</item>
+        <item msgid="9021860177999278496">"6 minuti"</item>
+        <item msgid="7224689200902680256">"7 minuti"</item>
+        <item msgid="4610012663985162123">"8 minuti"</item>
+        <item msgid="1717028898015659426">"9 minuti"</item>
+        <item msgid="8058492636464337699">"10 minuti"</item>
+        <item msgid="577767219993868603">"11 minuti"</item>
+        <item msgid="3710047869487864775">"12 minuti"</item>
+        <item msgid="3794200935630619331">"13 minuti"</item>
+        <item msgid="5462266433522229437">"14 minuti"</item>
+        <item msgid="2192100038569306041">"15 minuti"</item>
+        <item msgid="6636326047858437620">"16 minuti"</item>
+        <item msgid="2481054808772108352">"17 minuti"</item>
+        <item msgid="4080984064428458050">"18 minuti"</item>
+        <item msgid="5844319398703041730">"19 minuti"</item>
+        <item msgid="2334964289857921073">"20 minuti"</item>
+        <item msgid="4755209855817904977">"21 minuti"</item>
+        <item msgid="8414394445389367355">"22 minuti"</item>
+        <item msgid="2604612428763230265">"23 minuti"</item>
+        <item msgid="6871696471373403806">"24 minuti"</item>
+        <item msgid="1573685398431466364">"25 minuti"</item>
+        <item msgid="6999090368236684971">"26 minuti"</item>
+        <item msgid="7125056720603734703">"27 minuti"</item>
+        <item msgid="1695830988496463030">"28 minuti"</item>
+        <item msgid="6706610539793025916">"29 minuti"</item>
+        <item msgid="2898212818965905529">"30 minuti"</item>
+    </string-array>
     <string name="week_start_title" msgid="4268917518596832096">"Inizia la settimana di"</string>
-  <string-array name="week_start_entries">
-    <item msgid="9010198173394482639">"Sabato"</item>
-    <item msgid="3993530639455360921">"Domenica"</item>
-    <item msgid="8594709368683324282">"Lunedì"</item>
-  </string-array>
+    <string-array name="week_start_entries">
+        <item msgid="9010198173394482639">"Sabato"</item>
+        <item msgid="3993530639455360921">"Domenica"</item>
+        <item msgid="8594709368683324282">"Lunedì"</item>
+    </string-array>
     <string name="alarm_volume_title" msgid="8506245173912428522">"Volume sveglia"</string>
     <string name="silent_ringtone_title" msgid="6177287302898634765">"Silenzioso"</string>
     <string name="unknown_ringtone_title" msgid="6637522029614550112">"Elemento sconosciuto"</string>
@@ -185,11 +189,11 @@
     <string name="app_notifications_blocked" msgid="7249150789023936889">"Notifiche dell\'orologio bloccate"</string>
     <string name="alarms_blocked_by_dnd" msgid="6089433757505898969">"Il dispositivo è impostato su \"Silenzio totale\""</string>
     <string name="volume_button_setting_title" msgid="6937131248843413357">"Pulsanti volume"</string>
-  <string-array name="volume_button_setting_entries">
-    <item msgid="7972756698723318690">"Attiva ripetizione sveglia"</item>
-    <item msgid="3450979320164769576">"Ignora"</item>
-    <item msgid="7085774139907653538">"Regola volume"</item>
-  </string-array>
+    <string-array name="volume_button_setting_entries">
+        <item msgid="7972756698723318690">"Attiva ripetizione sveglia"</item>
+        <item msgid="3450979320164769576">"Ignora"</item>
+        <item msgid="7085774139907653538">"Regola volume"</item>
+    </string-array>
     <string name="label_description" msgid="8736179296142915727">"Etichetta"</string>
     <string name="ringtone_description" msgid="7580922112921069925">"Suoneria"</string>
     <string name="menu_alarm" msgid="4772010125376647519">"Sveglia"</string>
@@ -242,122 +246,122 @@
     <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
     <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <!-- no translation found for seconds (6550091082396571898) -->
-    <skip />
-  <string-array name="sw_share_strings">
-    <item msgid="842841032273927988">"Sei davvero un fulmine."</item>
-    <item msgid="6332879039890727169">"Goditi i frutti del tuo lavoro."</item>
-    <item msgid="815382761274660130">"Si sa che gli androidi sono veloci, ma non quanto te."</item>
-    <item msgid="7916250650982813737">"Fiuuu!"</item>
-    <item msgid="6836603904515182333">"L33t volte."</item>
-    <item msgid="7508085100680861631">"Che velocità portentosa."</item>
-    <item msgid="5961245252909589573">"Velocità di curvatura 5."</item>
-    <item msgid="5211891900854545940">"Veloce come un fulmine."</item>
-    <item msgid="9071353477103826053">"Più veloce della luce."</item>
-    <item msgid="3785193933691117181">"Velocità fotonica."</item>
-  </string-array>
+    <skip/>
+    <string-array name="sw_share_strings">
+        <item msgid="842841032273927988">"Sei davvero un fulmine."</item>
+        <item msgid="6332879039890727169">"Goditi i frutti del tuo lavoro."</item>
+        <item msgid="815382761274660130">"Si sa che gli androidi sono veloci, ma non quanto te."</item>
+        <item msgid="7916250650982813737">"Fiuuu!"</item>
+        <item msgid="6836603904515182333">"L33t volte."</item>
+        <item msgid="7508085100680861631">"Che velocità portentosa."</item>
+        <item msgid="5961245252909589573">"Velocità di curvatura 5."</item>
+        <item msgid="5211891900854545940">"Veloce come un fulmine."</item>
+        <item msgid="9071353477103826053">"Più veloce della luce."</item>
+        <item msgid="3785193933691117181">"Velocità fotonica."</item>
+    </string-array>
     <string name="home_label" msgid="4436139365695453870">"Casa"</string>
     <string name="cities_activity_title" msgid="8552462751129256730">"Città"</string>
     <string name="clock_settings" msgid="8317286807280600391">"Orologio"</string>
     <string name="clock_style" msgid="2265011060429742344">"Stile"</string>
     <string name="display_clock_seconds_pref" msgid="691506643469501643">"Mostra secondi nell\'orologio"</string>
     <string name="open_date_settings" msgid="7712226973337806152">"Modifica data e ora"</string>
-  <string-array name="clock_style_entries">
-    <item msgid="917900462224167608">"Analogico"</item>
-    <item msgid="8483930821046925592">"Digitale"</item>
-  </string-array>
+    <string-array name="clock_style_entries">
+        <item msgid="917900462224167608">"Analogico"</item>
+        <item msgid="8483930821046925592">"Digitale"</item>
+    </string-array>
     <string name="automatic_home_clock" msgid="6274174710735449252">"Ora di casa automatica"</string>
     <string name="automatic_home_clock_summary" msgid="6020476321040807273">"Quando viaggi in una zona dove l\'ora è diversa, aggiungi il tuo fuso orario"</string>
     <string name="home_time_zone" msgid="9199730676287974501">"Fuso orario di casa"</string>
     <string name="home_time_zone_title" msgid="807894493443834624">"Fuso orario di casa"</string>
     <string name="city_checked" msgid="616847871968019">"Città <xliff:g id="CITY_NAME">%s</xliff:g> selezionata"</string>
     <string name="city_unchecked" msgid="710212932781145918">"Città <xliff:g id="CITY_NAME">%s</xliff:g> non selezionata"</string>
-  <string-array name="timezone_labels">
-    <item msgid="5495601234086197399">"Isole Marshall"</item>
-    <item msgid="4196408495909011020">"Isola di Midway"</item>
-    <item msgid="1414384194857730006">"Hawaii"</item>
-    <item msgid="2687091371581931926">"Alaska"</item>
-    <item msgid="1922100269679049660">"Pacific Time"</item>
-    <item msgid="7156402158716866161">"Tijuana"</item>
-    <item msgid="1144117502254612241">"Arizona"</item>
-    <item msgid="101284182011722637">"Chihuahua"</item>
-    <item msgid="689121094232986897">"Mountain Time"</item>
-    <item msgid="5445331923942302756">"America centrale"</item>
-    <item msgid="2749806434052452351">"Fuso orario centrale - USA"</item>
-    <item msgid="3997138870229703753">"Città del Messico"</item>
-    <item msgid="5425567073027744888">"Saskatchewan"</item>
-    <item msgid="2877342865396629368">"Bogotá"</item>
-    <item msgid="568682398893899670">"Fuso orario orientale"</item>
-    <item msgid="668135984541863866">"Venezuela"</item>
-    <item msgid="3737474220861486223">"Atlantic Time (Barbados)"</item>
-    <item msgid="6279116051273436870">"Atlantic Time (Canada)"</item>
-    <item msgid="8513382867172014244">"Manaus"</item>
-    <item msgid="7776299003105932407">"Santiago"</item>
-    <item msgid="8636989494746218677">"Terranova"</item>
-    <item msgid="4402541016410147505">"Brasilia"</item>
-    <item msgid="2251184440733164084">"Buenos Aires"</item>
-    <item msgid="6202926618569004969">"Groenlandia"</item>
-    <item msgid="2355275037115290628">"Montevideo"</item>
-    <item msgid="1377549694711708945">"Mid-Atlantic"</item>
-    <item msgid="3457671272126347981">"Azzorre"</item>
-    <item msgid="3659315141063710840">"Isole di Capo Verde"</item>
-    <item msgid="1260941741802367635">"Casablanca"</item>
-    <item msgid="8275203689687954762">"Londra, Dublino"</item>
-    <item msgid="5970179539479320905">"Amsterdam, Berlino"</item>
-    <item msgid="5396319478750517962">"Belgrado"</item>
-    <item msgid="8688787475056663004">"Bruxelles"</item>
-    <item msgid="3415827874921681622">"Sarajevo"</item>
-    <item msgid="402008965928320066">"Windhoek"</item>
-    <item msgid="6436942724959275569">"W. Africa Time"</item>
-    <item msgid="954536568417204026">"Amman, Giordania"</item>
-    <item msgid="8932745482008902551">"Atene, Istanbul"</item>
-    <item msgid="320025725949024510">"Beirut, Libano"</item>
-    <item msgid="7242083112551905970">"Cairo"</item>
-    <item msgid="7241520146011450419">"Helsinki"</item>
-    <item msgid="2717065017510546526">"Gerusalemme"</item>
-    <item msgid="8698556287741466553">"Minsk"</item>
-    <item msgid="1797598357342084506">"Harare"</item>
-    <item msgid="5169119919905066998">"Baghdad"</item>
-    <item msgid="2615788116201065182">"Mosca"</item>
-    <item msgid="9084354867885584646">"Kuwait"</item>
-    <item msgid="1351570519986178268">"Nairobi"</item>
-    <item msgid="7094569580635877460">"Teheran"</item>
-    <item msgid="3953138772617909704">"Baku"</item>
-    <item msgid="2868893113598800752">"Tbilisi"</item>
-    <item msgid="7088581865802476373">"Yerevan"</item>
-    <item msgid="1941122257623887992">"Dubai"</item>
-    <item msgid="9194797225058249720">"Kabul"</item>
-    <item msgid="6486569254364577332">"Islamabad, Karachi"</item>
-    <item msgid="5487724896895412089">"Ural\'sk"</item>
-    <item msgid="364906869710826982">"Yekaterinburg"</item>
-    <item msgid="2106505051751383358">"Kolkata"</item>
-    <item msgid="6851586621581501447">"Sri Lanka"</item>
-    <item msgid="800438544128213134">"Kathmandu"</item>
-    <item msgid="6173621471007643021">"Astana"</item>
-    <item msgid="8645125891971581128">"Yangon"</item>
-    <item msgid="2886407505119737794">"Krasnoyarsk"</item>
-    <item msgid="3408222398188107090">"Bangkok"</item>
-    <item msgid="4441612937172851228">"Pechino"</item>
-    <item msgid="4936715789028996930">"Hong Kong"</item>
-    <item msgid="4261031143777385525">"Irkutsk"</item>
-    <item msgid="3538060959338191835">"Kuala Lumpur"</item>
-    <item msgid="1438847562643099201">"Perth"</item>
-    <item msgid="3063913827688244383">"Taipei"</item>
-    <item msgid="3502757135046564209">"Seul"</item>
-    <item msgid="6107588684519111669">"Tokyo, Osaka"</item>
-    <item msgid="4350769099755608471">"Yakutsk"</item>
-    <item msgid="2422707004533526462">"Adelaide"</item>
-    <item msgid="1292192084554134339">"Darwin"</item>
-    <item msgid="1320883699470001716">"Brisbane"</item>
-    <item msgid="5137198806146386527">"Hobart"</item>
-    <item msgid="5920063686933941174">"Sydney, Canberra"</item>
-    <item msgid="615906039696009425">"Vladivostok"</item>
-    <item msgid="7738680449356275374">"Guam"</item>
-    <item msgid="2882915026380778227">"Magadan"</item>
-    <item msgid="8255615641810148152">"Auckland"</item>
-    <item msgid="3027153773466391728">"Figi"</item>
-    <item msgid="5911600083231840181">"Tonga"</item>
-    <item msgid="5176858645450908751">"Giacarta"</item>
-  </string-array>
+    <string-array name="timezone_labels">
+        <item msgid="5495601234086197399">"Isole Marshall"</item>
+        <item msgid="4196408495909011020">"Isola di Midway"</item>
+        <item msgid="1414384194857730006">"Hawaii"</item>
+        <item msgid="2687091371581931926">"Alaska"</item>
+        <item msgid="1922100269679049660">"Pacific Time"</item>
+        <item msgid="7156402158716866161">"Tijuana"</item>
+        <item msgid="1144117502254612241">"Arizona"</item>
+        <item msgid="101284182011722637">"Chihuahua"</item>
+        <item msgid="689121094232986897">"Mountain Time"</item>
+        <item msgid="5445331923942302756">"America centrale"</item>
+        <item msgid="2749806434052452351">"Fuso orario centrale - USA"</item>
+        <item msgid="3997138870229703753">"Città del Messico"</item>
+        <item msgid="5425567073027744888">"Saskatchewan"</item>
+        <item msgid="2877342865396629368">"Bogotá"</item>
+        <item msgid="568682398893899670">"Fuso orario orientale"</item>
+        <item msgid="668135984541863866">"Venezuela"</item>
+        <item msgid="3737474220861486223">"Atlantic Time (Barbados)"</item>
+        <item msgid="6279116051273436870">"Atlantic Time (Canada)"</item>
+        <item msgid="8513382867172014244">"Manaus"</item>
+        <item msgid="7776299003105932407">"Santiago"</item>
+        <item msgid="8636989494746218677">"Terranova"</item>
+        <item msgid="4402541016410147505">"Brasilia"</item>
+        <item msgid="2251184440733164084">"Buenos Aires"</item>
+        <item msgid="6202926618569004969">"Groenlandia"</item>
+        <item msgid="2355275037115290628">"Montevideo"</item>
+        <item msgid="1377549694711708945">"Mid-Atlantic"</item>
+        <item msgid="3457671272126347981">"Azzorre"</item>
+        <item msgid="3659315141063710840">"Isole di Capo Verde"</item>
+        <item msgid="1260941741802367635">"Casablanca"</item>
+        <item msgid="8275203689687954762">"Londra, Dublino"</item>
+        <item msgid="5970179539479320905">"Amsterdam, Berlino"</item>
+        <item msgid="5396319478750517962">"Belgrado"</item>
+        <item msgid="8688787475056663004">"Bruxelles"</item>
+        <item msgid="3415827874921681622">"Sarajevo"</item>
+        <item msgid="402008965928320066">"Windhoek"</item>
+        <item msgid="6436942724959275569">"W. Africa Time"</item>
+        <item msgid="954536568417204026">"Amman, Giordania"</item>
+        <item msgid="8932745482008902551">"Atene, Istanbul"</item>
+        <item msgid="320025725949024510">"Beirut, Libano"</item>
+        <item msgid="7242083112551905970">"Cairo"</item>
+        <item msgid="7241520146011450419">"Helsinki"</item>
+        <item msgid="2717065017510546526">"Gerusalemme"</item>
+        <item msgid="8698556287741466553">"Minsk"</item>
+        <item msgid="1797598357342084506">"Harare"</item>
+        <item msgid="5169119919905066998">"Baghdad"</item>
+        <item msgid="2615788116201065182">"Mosca"</item>
+        <item msgid="9084354867885584646">"Kuwait"</item>
+        <item msgid="1351570519986178268">"Nairobi"</item>
+        <item msgid="7094569580635877460">"Teheran"</item>
+        <item msgid="3953138772617909704">"Baku"</item>
+        <item msgid="2868893113598800752">"Tbilisi"</item>
+        <item msgid="7088581865802476373">"Yerevan"</item>
+        <item msgid="1941122257623887992">"Dubai"</item>
+        <item msgid="9194797225058249720">"Kabul"</item>
+        <item msgid="6486569254364577332">"Islamabad, Karachi"</item>
+        <item msgid="5487724896895412089">"Ural\'sk"</item>
+        <item msgid="364906869710826982">"Yekaterinburg"</item>
+        <item msgid="2106505051751383358">"Kolkata"</item>
+        <item msgid="6851586621581501447">"Sri Lanka"</item>
+        <item msgid="800438544128213134">"Kathmandu"</item>
+        <item msgid="6173621471007643021">"Astana"</item>
+        <item msgid="8645125891971581128">"Yangon"</item>
+        <item msgid="2886407505119737794">"Krasnoyarsk"</item>
+        <item msgid="3408222398188107090">"Bangkok"</item>
+        <item msgid="4441612937172851228">"Pechino"</item>
+        <item msgid="4936715789028996930">"Hong Kong"</item>
+        <item msgid="4261031143777385525">"Irkutsk"</item>
+        <item msgid="3538060959338191835">"Kuala Lumpur"</item>
+        <item msgid="1438847562643099201">"Perth"</item>
+        <item msgid="3063913827688244383">"Taipei"</item>
+        <item msgid="3502757135046564209">"Seul"</item>
+        <item msgid="6107588684519111669">"Tokyo, Osaka"</item>
+        <item msgid="4350769099755608471">"Yakutsk"</item>
+        <item msgid="2422707004533526462">"Adelaide"</item>
+        <item msgid="1292192084554134339">"Darwin"</item>
+        <item msgid="1320883699470001716">"Brisbane"</item>
+        <item msgid="5137198806146386527">"Hobart"</item>
+        <item msgid="5920063686933941174">"Sydney, Canberra"</item>
+        <item msgid="615906039696009425">"Vladivostok"</item>
+        <item msgid="7738680449356275374">"Guam"</item>
+        <item msgid="2882915026380778227">"Magadan"</item>
+        <item msgid="8255615641810148152">"Auckland"</item>
+        <item msgid="3027153773466391728">"Figi"</item>
+        <item msgid="5911600083231840181">"Tonga"</item>
+        <item msgid="5176858645450908751">"Giacarta"</item>
+    </string-array>
     <string name="shortcut_new_alarm_short" msgid="3490418929139725538">"Nuova sveglia"</string>
     <string name="shortcut_new_alarm_long" msgid="4778064830147981089">"Crea nuova sveglia"</string>
     <string name="shortcut_new_timer_short" msgid="3793414543219297884">"Nuovo timer"</string>
@@ -410,8 +414,8 @@
     <string name="alarm_is_set" msgid="5503226382620011088">"Sveglia impostata per le ore <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
     <string name="timer_created" msgid="4381027137335885547">"Timer creato"</string>
     <plurals name="expired_timers_dismissed" formatted="false" msgid="1294953410988488149">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> timer ignorati</item>
-      <item quantity="one">Timer ignorato</item>
+        <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> timer ignorati</item>
+        <item quantity="one">Timer ignorato</item>
     </plurals>
     <string name="timer_deleted" msgid="9110322362460029392">"Timer eliminato"</string>
     <string name="invalid_timer_length" msgid="3104567893212932487">"Durata del timer non valida"</string>
@@ -422,4 +426,4 @@
     <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>
+</resources>
\ No newline at end of file
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 839dc71f3..239ad0529 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- 
   Copyright (C) 2016 The Android Open Source Project
 
@@ -13,10 +13,7 @@
   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.
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+   --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="6674495003718166674">"Klok"</string>
     <string name="label" msgid="162189613902857319">"Label"</string>
     <string name="default_label" msgid="5590025289805630372">"Wekker"</string>
@@ -40,14 +37,14 @@
     <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
     <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Gesnoozed"</string>
     <plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min.</item>
-      <item quantity="one">1 min.</item>
+        <item quantity="one">1 min</item>
+        <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> min</item>
     </plurals>
     <string name="alarm_alert_off_text" msgid="4472073417593915002">"Wekker uit"</string>
     <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Snoozen"</string>
     <plurals name="alarm_alert_snooze_set" formatted="false" msgid="3212729193036041768">
-      <item quantity="other">Snooze is ingesteld op <xliff:g id="MINUTES">%d</xliff:g> minuten.</item>
-      <item quantity="one">Snooze is ingesteld op 1 minuut.</item>
+        <item quantity="other">Snooze is ingesteld op <xliff:g id="MINUTES">%d</xliff:g> minuten.</item>
+        <item quantity="one">Snooze is ingesteld op 1 minuut.</item>
     </plurals>
     <string name="alarm_alert_snooze_until" msgid="6958013659168344550">"Snoozen tot <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="alarm_alert_predismiss_title" msgid="5723945586913705445">"Volgende wekker"</string>
@@ -65,39 +62,39 @@
     <string name="timer_accessibility_started" msgid="8503877052873671219">"Timer loopt, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="timer_remaining_single" msgid="6782851171906765864">"resterend"</string>
     <string name="timer_remaining_multiple" msgid="6052775962092160851">"resterend"</string>
-  <string-array name="alarm_set">
-    <item msgid="6450913786084215050">"Wekker gaat over minder dan 1 minuut."</item>
-    <item msgid="6002066367368421848">"Wekker gaat over <xliff:g id="DAYS">%1$s</xliff:g>."</item>
-    <item msgid="8824719306247973774">"Wekker gaat over <xliff:g id="HOURS">%2$s</xliff:g>."</item>
-    <item msgid="8182406852935468862">"Wekker gaat over <xliff:g id="DAYS">%1$s</xliff:g> en <xliff:g id="HOURS">%2$s</xliff:g>."</item>
-    <item msgid="2532279224777213194">"Wekker gaat over <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
-    <item msgid="5936557894247187717">"Wekker gaat over <xliff:g id="DAYS">%1$s</xliff:g> en <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
-    <item msgid="9115697840826129603">"Wekker gaat over <xliff:g id="HOURS">%2$s</xliff:g> en <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
-    <item msgid="2332583385137381060">"Wekker gaat af over <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>."</item>
-  </string-array>
+    <string-array name="alarm_set">
+        <item msgid="6450913786084215050">"Wekker gaat over minder dan 1 minuut."</item>
+        <item msgid="6002066367368421848">"Wekker gaat over <xliff:g id="DAYS">%1$s</xliff:g>."</item>
+        <item msgid="8824719306247973774">"Wekker gaat over <xliff:g id="HOURS">%2$s</xliff:g>."</item>
+        <item msgid="8182406852935468862">"Wekker gaat over <xliff:g id="DAYS">%1$s</xliff:g> en <xliff:g id="HOURS">%2$s</xliff:g>."</item>
+        <item msgid="2532279224777213194">"Wekker gaat over <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
+        <item msgid="5936557894247187717">"Wekker gaat over <xliff:g id="DAYS">%1$s</xliff:g> en <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
+        <item msgid="9115697840826129603">"Wekker gaat over <xliff:g id="HOURS">%2$s</xliff:g> en <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
+        <item msgid="2332583385137381060">"Wekker gaat af over <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>."</item>
+    </string-array>
     <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>
+        <item quantity="one">1 dag</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> dagen</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>
+        <item quantity="one">1 uur</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> uren</item>
     </plurals>
     <plurals name="hours_short" formatted="false" msgid="3709250715691092925">
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> u</item>
-      <item quantity="one">1 u</item>
+        <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> u</item>
+        <item quantity="one">1 u</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>
+        <item quantity="one">1 minuut</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> minuten</item>
     </plurals>
     <plurals name="minutes_short" formatted="false" msgid="6397328304369080233">
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> min.</item>
-      <item quantity="one">1 min.</item>
+        <item quantity="one">1 min</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> min</item>
     </plurals>
     <plurals name="seconds" formatted="false" msgid="670343577734266047">
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> seconden</item>
-      <item quantity="one">1 seconde</item>
+        <item quantity="one">1 seconde</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> seconden</item>
     </plurals>
     <string name="every_day" msgid="4100909974923444602">"Elke dag"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
@@ -109,72 +106,72 @@
     <string name="crescendo_duration_title" msgid="8606408542726189528">"Volume geleidelijk verhogen"</string>
     <string name="auto_silence_title" msgid="2012754009554434544">"Stil na"</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>
+        <item quantity="one">1 minuut</item>
+        <item quantity="other"><xliff:g id="formatted_number" example="7">%s</xliff:g> minuten</item>
     </plurals>
     <string name="auto_silence_never" msgid="4821982647348750809">"Nooit"</string>
-  <string-array name="auto_silence_entries">
-    <item msgid="3024545954917711306">"1 minuut"</item>
-    <item msgid="5431906692406316549">"5 minuten"</item>
-    <item msgid="7742728812068919959">"10 minuten"</item>
-    <item msgid="2855948657259647629">"15 minuten"</item>
-    <item msgid="6330196381284475079">"20 minuten"</item>
-    <item msgid="7809240121716151904">"25 minuten"</item>
-    <item msgid="4278641338024561333">"Nooit"</item>
-  </string-array>
-  <string-array name="crescendo_entries">
-    <item msgid="7435149932182641128">"Uit"</item>
-    <item msgid="7195451681426992018">"5 seconden"</item>
-    <item msgid="592917601923801901">"10 seconden"</item>
-    <item msgid="5050318776687582653">"15 seconden"</item>
-    <item msgid="6997726466563948756">"20 seconden"</item>
-    <item msgid="1237360231425097772">"25 seconden"</item>
-    <item msgid="248014374051498284">"30 seconden"</item>
-    <item msgid="6110450211551791852">"35 seconden"</item>
-    <item msgid="8010211657612404516">"40 seconden"</item>
-    <item msgid="3730631498119797451">"45 seconden"</item>
-    <item msgid="623829984393124488">"50 seconden"</item>
-    <item msgid="6390209981529164605">"55 seconden"</item>
-    <item msgid="5261571706794132923">"60 seconden"</item>
-  </string-array>
-  <string-array name="snooze_duration_entries">
-    <item msgid="7668553664977446797">"1 minuut"</item>
-    <item msgid="4482596794620161030">"2 minuten"</item>
-    <item msgid="8478276201849960314">"3 minuten"</item>
-    <item msgid="4038456474851212478">"4 minuten"</item>
-    <item msgid="6298175579152122770">"5 minuten"</item>
-    <item msgid="9021860177999278496">"6 minuten"</item>
-    <item msgid="7224689200902680256">"7 minuten"</item>
-    <item msgid="4610012663985162123">"8 minuten"</item>
-    <item msgid="1717028898015659426">"9 minuten"</item>
-    <item msgid="8058492636464337699">"10 minuten"</item>
-    <item msgid="577767219993868603">"11 minuten"</item>
-    <item msgid="3710047869487864775">"12 minuten"</item>
-    <item msgid="3794200935630619331">"13 minuten"</item>
-    <item msgid="5462266433522229437">"14 minuten"</item>
-    <item msgid="2192100038569306041">"15 minuten"</item>
-    <item msgid="6636326047858437620">"16 minuten"</item>
-    <item msgid="2481054808772108352">"17 minuten"</item>
-    <item msgid="4080984064428458050">"18 minuten"</item>
-    <item msgid="5844319398703041730">"19 minuten"</item>
-    <item msgid="2334964289857921073">"20 minuten"</item>
-    <item msgid="4755209855817904977">"21 minuten"</item>
-    <item msgid="8414394445389367355">"22 minuten"</item>
-    <item msgid="2604612428763230265">"23 minuten"</item>
-    <item msgid="6871696471373403806">"24 minuten"</item>
-    <item msgid="1573685398431466364">"25 minuten"</item>
-    <item msgid="6999090368236684971">"26 minuten"</item>
-    <item msgid="7125056720603734703">"27 minuten"</item>
-    <item msgid="1695830988496463030">"28 minuten"</item>
-    <item msgid="6706610539793025916">"29 minuten"</item>
-    <item msgid="2898212818965905529">"30 minuten"</item>
-  </string-array>
+    <string-array name="auto_silence_entries">
+        <item msgid="3024545954917711306">"1 minuut"</item>
+        <item msgid="5431906692406316549">"5 minuten"</item>
+        <item msgid="7742728812068919959">"10 minuten"</item>
+        <item msgid="2855948657259647629">"15 minuten"</item>
+        <item msgid="6330196381284475079">"20 minuten"</item>
+        <item msgid="7809240121716151904">"25 minuten"</item>
+        <item msgid="4278641338024561333">"Nooit"</item>
+    </string-array>
+    <string-array name="crescendo_entries">
+        <item msgid="7435149932182641128">"Uit"</item>
+        <item msgid="7195451681426992018">"5 seconden"</item>
+        <item msgid="592917601923801901">"10 seconden"</item>
+        <item msgid="5050318776687582653">"15 seconden"</item>
+        <item msgid="6997726466563948756">"20 seconden"</item>
+        <item msgid="1237360231425097772">"25 seconden"</item>
+        <item msgid="248014374051498284">"30 seconden"</item>
+        <item msgid="6110450211551791852">"35 seconden"</item>
+        <item msgid="8010211657612404516">"40 seconden"</item>
+        <item msgid="3730631498119797451">"45 seconden"</item>
+        <item msgid="623829984393124488">"50 seconden"</item>
+        <item msgid="6390209981529164605">"55 seconden"</item>
+        <item msgid="5261571706794132923">"60 seconden"</item>
+    </string-array>
+    <string-array name="snooze_duration_entries">
+        <item msgid="7668553664977446797">"1 minuut"</item>
+        <item msgid="4482596794620161030">"2 minuten"</item>
+        <item msgid="8478276201849960314">"3 minuten"</item>
+        <item msgid="4038456474851212478">"4 minuten"</item>
+        <item msgid="6298175579152122770">"5 minuten"</item>
+        <item msgid="9021860177999278496">"6 minuten"</item>
+        <item msgid="7224689200902680256">"7 minuten"</item>
+        <item msgid="4610012663985162123">"8 minuten"</item>
+        <item msgid="1717028898015659426">"9 minuten"</item>
+        <item msgid="8058492636464337699">"10 minuten"</item>
+        <item msgid="577767219993868603">"11 minuten"</item>
+        <item msgid="3710047869487864775">"12 minuten"</item>
+        <item msgid="3794200935630619331">"13 minuten"</item>
+        <item msgid="5462266433522229437">"14 minuten"</item>
+        <item msgid="2192100038569306041">"15 minuten"</item>
+        <item msgid="6636326047858437620">"16 minuten"</item>
+        <item msgid="2481054808772108352">"17 minuten"</item>
+        <item msgid="4080984064428458050">"18 minuten"</item>
+        <item msgid="5844319398703041730">"19 minuten"</item>
+        <item msgid="2334964289857921073">"20 minuten"</item>
+        <item msgid="4755209855817904977">"21 minuten"</item>
+        <item msgid="8414394445389367355">"22 minuten"</item>
+        <item msgid="2604612428763230265">"23 minuten"</item>
+        <item msgid="6871696471373403806">"24 minuten"</item>
+        <item msgid="1573685398431466364">"25 minuten"</item>
+        <item msgid="6999090368236684971">"26 minuten"</item>
+        <item msgid="7125056720603734703">"27 minuten"</item>
+        <item msgid="1695830988496463030">"28 minuten"</item>
+        <item msgid="6706610539793025916">"29 minuten"</item>
+        <item msgid="2898212818965905529">"30 minuten"</item>
+    </string-array>
     <string name="week_start_title" msgid="4268917518596832096">"Week starten op"</string>
-  <string-array name="week_start_entries">
-    <item msgid="9010198173394482639">"Zaterdag"</item>
-    <item msgid="3993530639455360921">"Zondag"</item>
-    <item msgid="8594709368683324282">"Maandag"</item>
-  </string-array>
+    <string-array name="week_start_entries">
+        <item msgid="9010198173394482639">"Zaterdag"</item>
+        <item msgid="3993530639455360921">"Zondag"</item>
+        <item msgid="8594709368683324282">"Maandag"</item>
+    </string-array>
     <string name="alarm_volume_title" msgid="8506245173912428522">"Alarmvolume"</string>
     <string name="silent_ringtone_title" msgid="6177287302898634765">"Stil"</string>
     <string name="unknown_ringtone_title" msgid="6637522029614550112">"Onbekend"</string>
@@ -185,11 +182,11 @@
     <string name="app_notifications_blocked" msgid="7249150789023936889">"Meldingen van de app Klok worden geblokkeerd"</string>
     <string name="alarms_blocked_by_dnd" msgid="6089433757505898969">"Apparaat is ingesteld op totale stilte"</string>
     <string name="volume_button_setting_title" msgid="6937131248843413357">"Volumeknoppen"</string>
-  <string-array name="volume_button_setting_entries">
-    <item msgid="7972756698723318690">"Snoozen"</item>
-    <item msgid="3450979320164769576">"Uitzetten"</item>
-    <item msgid="7085774139907653538">"Volume regelen"</item>
-  </string-array>
+    <string-array name="volume_button_setting_entries">
+        <item msgid="7972756698723318690">"Snoozen"</item>
+        <item msgid="3450979320164769576">"Uitzetten"</item>
+        <item msgid="7085774139907653538">"Volume regelen"</item>
+    </string-array>
     <string name="label_description" msgid="8736179296142915727">"Label"</string>
     <string name="ringtone_description" msgid="7580922112921069925">"Ringtone"</string>
     <string name="menu_alarm" msgid="4772010125376647519">"Wekker"</string>
@@ -242,122 +239,122 @@
     <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
     <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <!-- no translation found for seconds (6550091082396571898) -->
-    <skip />
-  <string-array name="sw_share_strings">
-    <item msgid="842841032273927988">"Je bent wel erg snel."</item>
-    <item msgid="6332879039890727169">"Profiteer van je inspanningen."</item>
-    <item msgid="815382761274660130">"Androids staan bekend om hun snelheid, maar jij bent nog sneller."</item>
-    <item msgid="7916250650982813737">"Oef."</item>
-    <item msgid="6836603904515182333">"Mooie tijden."</item>
-    <item msgid="7508085100680861631">"Wat een wonderbaarlijke snelheid."</item>
-    <item msgid="5961245252909589573">"Laten we weer gaan tijdreizen."</item>
-    <item msgid="5211891900854545940">"Spring gewoon naar links."</item>
-    <item msgid="9071353477103826053">"Haast zit in je aard."</item>
-    <item msgid="3785193933691117181">"Lichtsnelheid."</item>
-  </string-array>
+    <skip/>
+    <string-array name="sw_share_strings">
+        <item msgid="842841032273927988">"Je bent wel erg snel."</item>
+        <item msgid="6332879039890727169">"Profiteer van je inspanningen."</item>
+        <item msgid="815382761274660130">"Androids staan bekend om hun snelheid, maar jij bent nog sneller."</item>
+        <item msgid="7916250650982813737">"Oef."</item>
+        <item msgid="6836603904515182333">"Mooie tijden."</item>
+        <item msgid="7508085100680861631">"Wat een wonderbaarlijke snelheid."</item>
+        <item msgid="5961245252909589573">"Laten we weer gaan tijdreizen."</item>
+        <item msgid="5211891900854545940">"Spring gewoon naar links."</item>
+        <item msgid="9071353477103826053">"Haast zit in je aard."</item>
+        <item msgid="3785193933691117181">"Lichtsnelheid."</item>
+    </string-array>
     <string name="home_label" msgid="4436139365695453870">"Thuis"</string>
     <string name="cities_activity_title" msgid="8552462751129256730">"Plaatsen"</string>
     <string name="clock_settings" msgid="8317286807280600391">"Klok"</string>
     <string name="clock_style" msgid="2265011060429742344">"Stijl"</string>
     <string name="display_clock_seconds_pref" msgid="691506643469501643">"Tijd met seconden weergeven"</string>
     <string name="open_date_settings" msgid="7712226973337806152">"Datum en tijd wijzigen"</string>
-  <string-array name="clock_style_entries">
-    <item msgid="917900462224167608">"Analoog"</item>
-    <item msgid="8483930821046925592">"Digitaal"</item>
-  </string-array>
+    <string-array name="clock_style_entries">
+        <item msgid="917900462224167608">"Analoog"</item>
+        <item msgid="8483930821046925592">"Digitaal"</item>
+    </string-array>
     <string name="automatic_home_clock" msgid="6274174710735449252">"Automatische klok voor thuis"</string>
     <string name="automatic_home_clock_summary" msgid="6020476321040807273">"Voeg een klok voor thuis toe wanneer je in een andere tijdzone reist."</string>
     <string name="home_time_zone" msgid="9199730676287974501">"Eigen tijdzone"</string>
     <string name="home_time_zone_title" msgid="807894493443834624">"Eigen tijdzone"</string>
     <string name="city_checked" msgid="616847871968019">"<xliff:g id="CITY_NAME">%s</xliff:g> aangevinkt"</string>
     <string name="city_unchecked" msgid="710212932781145918">"<xliff:g id="CITY_NAME">%s</xliff:g> niet aangevinkt"</string>
-  <string-array name="timezone_labels">
-    <item msgid="5495601234086197399">"Marshalleilanden"</item>
-    <item msgid="4196408495909011020">"Midway Island"</item>
-    <item msgid="1414384194857730006">"Hawaï"</item>
-    <item msgid="2687091371581931926">"Alaska"</item>
-    <item msgid="1922100269679049660">"Pacific Time"</item>
-    <item msgid="7156402158716866161">"Tijuana"</item>
-    <item msgid="1144117502254612241">"Arizona"</item>
-    <item msgid="101284182011722637">"Chihuahua"</item>
-    <item msgid="689121094232986897">"Mountain Time"</item>
-    <item msgid="5445331923942302756">"Centraal-Amerika"</item>
-    <item msgid="2749806434052452351">"Central Time"</item>
-    <item msgid="3997138870229703753">"Mexico-stad"</item>
-    <item msgid="5425567073027744888">"Saskatchewan"</item>
-    <item msgid="2877342865396629368">"Bogotá"</item>
-    <item msgid="568682398893899670">"Eastern Time"</item>
-    <item msgid="668135984541863866">"Venezuela"</item>
-    <item msgid="3737474220861486223">"Atlantic Time (Barbados)"</item>
-    <item msgid="6279116051273436870">"Atlantic Time (Canada)"</item>
-    <item msgid="8513382867172014244">"Manaus"</item>
-    <item msgid="7776299003105932407">"Santiago"</item>
-    <item msgid="8636989494746218677">"Newfoundland"</item>
-    <item msgid="4402541016410147505">"Brasilia"</item>
-    <item msgid="2251184440733164084">"Buenos Aires"</item>
-    <item msgid="6202926618569004969">"Groenland"</item>
-    <item msgid="2355275037115290628">"Montevideo"</item>
-    <item msgid="1377549694711708945">"Midatlantisch"</item>
-    <item msgid="3457671272126347981">"Azoren"</item>
-    <item msgid="3659315141063710840">"Kaapverdië"</item>
-    <item msgid="1260941741802367635">"Casablanca"</item>
-    <item msgid="8275203689687954762">"Londen, Dublin"</item>
-    <item msgid="5970179539479320905">"Amsterdam, Berlijn"</item>
-    <item msgid="5396319478750517962">"Belgrado"</item>
-    <item msgid="8688787475056663004">"Brussel"</item>
-    <item msgid="3415827874921681622">"Sarajevo"</item>
-    <item msgid="402008965928320066">"Windhoek"</item>
-    <item msgid="6436942724959275569">"West-Afrikaanse Tijd"</item>
-    <item msgid="954536568417204026">"Amman, Jordanië"</item>
-    <item msgid="8932745482008902551">"Athene, Istanbul"</item>
-    <item msgid="320025725949024510">"Beiroet, Libanon"</item>
-    <item msgid="7242083112551905970">"Caïro"</item>
-    <item msgid="7241520146011450419">"Helsinki"</item>
-    <item msgid="2717065017510546526">"Jeruzalem"</item>
-    <item msgid="8698556287741466553">"Minsk"</item>
-    <item msgid="1797598357342084506">"Harare"</item>
-    <item msgid="5169119919905066998">"Bagdad"</item>
-    <item msgid="2615788116201065182">"Moskou"</item>
-    <item msgid="9084354867885584646">"Koeweit"</item>
-    <item msgid="1351570519986178268">"Nairobi"</item>
-    <item msgid="7094569580635877460">"Teheran"</item>
-    <item msgid="3953138772617909704">"Bakoe"</item>
-    <item msgid="2868893113598800752">"Tbilisi"</item>
-    <item msgid="7088581865802476373">"Erevan"</item>
-    <item msgid="1941122257623887992">"Dubai"</item>
-    <item msgid="9194797225058249720">"Kabul"</item>
-    <item msgid="6486569254364577332">"Islamabad, Karachi"</item>
-    <item msgid="5487724896895412089">"Oeralsk"</item>
-    <item msgid="364906869710826982">"Jekaterinenburg"</item>
-    <item msgid="2106505051751383358">"Kolkata"</item>
-    <item msgid="6851586621581501447">"Sri Lanka"</item>
-    <item msgid="800438544128213134">"Kathmandu"</item>
-    <item msgid="6173621471007643021">"Astana"</item>
-    <item msgid="8645125891971581128">"Yangon"</item>
-    <item msgid="2886407505119737794">"Krasnoyarsk"</item>
-    <item msgid="3408222398188107090">"Bangkok"</item>
-    <item msgid="4441612937172851228">"Peking"</item>
-    <item msgid="4936715789028996930">"Hongkong"</item>
-    <item msgid="4261031143777385525">"Irkoetsk"</item>
-    <item msgid="3538060959338191835">"Kuala Lumpur"</item>
-    <item msgid="1438847562643099201">"Perth"</item>
-    <item msgid="3063913827688244383">"Taipei"</item>
-    <item msgid="3502757135046564209">"Seoul"</item>
-    <item msgid="6107588684519111669">"Tokio, Osaka"</item>
-    <item msgid="4350769099755608471">"Jakoetsk"</item>
-    <item msgid="2422707004533526462">"Adelaide"</item>
-    <item msgid="1292192084554134339">"Darwin"</item>
-    <item msgid="1320883699470001716">"Brisbane"</item>
-    <item msgid="5137198806146386527">"Hobart"</item>
-    <item msgid="5920063686933941174">"Sydney, Canberra"</item>
-    <item msgid="615906039696009425">"Vladivostok"</item>
-    <item msgid="7738680449356275374">"Guam"</item>
-    <item msgid="2882915026380778227">"Magadan"</item>
-    <item msgid="8255615641810148152">"Auckland"</item>
-    <item msgid="3027153773466391728">"Fiji"</item>
-    <item msgid="5911600083231840181">"Tonga"</item>
-    <item msgid="5176858645450908751">"Jakarta"</item>
-  </string-array>
+    <string-array name="timezone_labels">
+        <item msgid="5495601234086197399">"Marshalleilanden"</item>
+        <item msgid="4196408495909011020">"Midway Island"</item>
+        <item msgid="1414384194857730006">"Hawaï"</item>
+        <item msgid="2687091371581931926">"Alaska"</item>
+        <item msgid="1922100269679049660">"Pacific Time"</item>
+        <item msgid="7156402158716866161">"Tijuana"</item>
+        <item msgid="1144117502254612241">"Arizona"</item>
+        <item msgid="101284182011722637">"Chihuahua"</item>
+        <item msgid="689121094232986897">"Mountain Time"</item>
+        <item msgid="5445331923942302756">"Centraal-Amerika"</item>
+        <item msgid="2749806434052452351">"Central Time"</item>
+        <item msgid="3997138870229703753">"Mexico-stad"</item>
+        <item msgid="5425567073027744888">"Saskatchewan"</item>
+        <item msgid="2877342865396629368">"Bogotá"</item>
+        <item msgid="568682398893899670">"Eastern Time"</item>
+        <item msgid="668135984541863866">"Venezuela"</item>
+        <item msgid="3737474220861486223">"Atlantic Time (Barbados)"</item>
+        <item msgid="6279116051273436870">"Atlantic Time (Canada)"</item>
+        <item msgid="8513382867172014244">"Manaus"</item>
+        <item msgid="7776299003105932407">"Santiago"</item>
+        <item msgid="8636989494746218677">"Newfoundland"</item>
+        <item msgid="4402541016410147505">"Brasilia"</item>
+        <item msgid="2251184440733164084">"Buenos Aires"</item>
+        <item msgid="6202926618569004969">"Groenland"</item>
+        <item msgid="2355275037115290628">"Montevideo"</item>
+        <item msgid="1377549694711708945">"Midatlantisch"</item>
+        <item msgid="3457671272126347981">"Azoren"</item>
+        <item msgid="3659315141063710840">"Kaapverdië"</item>
+        <item msgid="1260941741802367635">"Casablanca"</item>
+        <item msgid="8275203689687954762">"Londen, Dublin"</item>
+        <item msgid="5970179539479320905">"Amsterdam, Berlijn"</item>
+        <item msgid="5396319478750517962">"Belgrado"</item>
+        <item msgid="8688787475056663004">"Brussel"</item>
+        <item msgid="3415827874921681622">"Sarajevo"</item>
+        <item msgid="402008965928320066">"Windhoek"</item>
+        <item msgid="6436942724959275569">"West-Afrikaanse Tijd"</item>
+        <item msgid="954536568417204026">"Amman, Jordanië"</item>
+        <item msgid="8932745482008902551">"Athene, Istanbul"</item>
+        <item msgid="320025725949024510">"Beiroet, Libanon"</item>
+        <item msgid="7242083112551905970">"Caïro"</item>
+        <item msgid="7241520146011450419">"Helsinki"</item>
+        <item msgid="2717065017510546526">"Jeruzalem"</item>
+        <item msgid="8698556287741466553">"Minsk"</item>
+        <item msgid="1797598357342084506">"Harare"</item>
+        <item msgid="5169119919905066998">"Bagdad"</item>
+        <item msgid="2615788116201065182">"Moskou"</item>
+        <item msgid="9084354867885584646">"Koeweit"</item>
+        <item msgid="1351570519986178268">"Nairobi"</item>
+        <item msgid="7094569580635877460">"Teheran"</item>
+        <item msgid="3953138772617909704">"Bakoe"</item>
+        <item msgid="2868893113598800752">"Tbilisi"</item>
+        <item msgid="7088581865802476373">"Erevan"</item>
+        <item msgid="1941122257623887992">"Dubai"</item>
+        <item msgid="9194797225058249720">"Kabul"</item>
+        <item msgid="6486569254364577332">"Islamabad, Karachi"</item>
+        <item msgid="5487724896895412089">"Oeralsk"</item>
+        <item msgid="364906869710826982">"Jekaterinenburg"</item>
+        <item msgid="2106505051751383358">"Kolkata"</item>
+        <item msgid="6851586621581501447">"Sri Lanka"</item>
+        <item msgid="800438544128213134">"Kathmandu"</item>
+        <item msgid="6173621471007643021">"Astana"</item>
+        <item msgid="8645125891971581128">"Yangon"</item>
+        <item msgid="2886407505119737794">"Krasnoyarsk"</item>
+        <item msgid="3408222398188107090">"Bangkok"</item>
+        <item msgid="4441612937172851228">"Peking"</item>
+        <item msgid="4936715789028996930">"Hongkong"</item>
+        <item msgid="4261031143777385525">"Irkoetsk"</item>
+        <item msgid="3538060959338191835">"Kuala Lumpur"</item>
+        <item msgid="1438847562643099201">"Perth"</item>
+        <item msgid="3063913827688244383">"Taipei"</item>
+        <item msgid="3502757135046564209">"Seoul"</item>
+        <item msgid="6107588684519111669">"Tokio, Osaka"</item>
+        <item msgid="4350769099755608471">"Jakoetsk"</item>
+        <item msgid="2422707004533526462">"Adelaide"</item>
+        <item msgid="1292192084554134339">"Darwin"</item>
+        <item msgid="1320883699470001716">"Brisbane"</item>
+        <item msgid="5137198806146386527">"Hobart"</item>
+        <item msgid="5920063686933941174">"Sydney, Canberra"</item>
+        <item msgid="615906039696009425">"Vladivostok"</item>
+        <item msgid="7738680449356275374">"Guam"</item>
+        <item msgid="2882915026380778227">"Magadan"</item>
+        <item msgid="8255615641810148152">"Auckland"</item>
+        <item msgid="3027153773466391728">"Fiji"</item>
+        <item msgid="5911600083231840181">"Tonga"</item>
+        <item msgid="5176858645450908751">"Jakarta"</item>
+    </string-array>
     <string name="shortcut_new_alarm_short" msgid="3490418929139725538">"Nieuwe wekker"</string>
     <string name="shortcut_new_alarm_long" msgid="4778064830147981089">"Nieuwe wekker maken"</string>
     <string name="shortcut_new_timer_short" msgid="3793414543219297884">"Nieuwe timer"</string>
@@ -410,8 +407,8 @@
     <string name="alarm_is_set" msgid="5503226382620011088">"Wekker is ingesteld voor <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
     <string name="timer_created" msgid="4381027137335885547">"Timer gemaakt"</string>
     <plurals name="expired_timers_dismissed" formatted="false" msgid="1294953410988488149">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> timers gesloten</item>
-      <item quantity="one">Timer gesloten</item>
+        <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> timers gesloten</item>
+        <item quantity="one">Timer gesloten</item>
     </plurals>
     <string name="timer_deleted" msgid="9110322362460029392">"Timer verwijderd"</string>
     <string name="invalid_timer_length" msgid="3104567893212932487">"Ongeldige timerduur"</string>
@@ -422,4 +419,4 @@
     <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Kiezen welke wekker je wilt sluiten"</string>
     <string name="no_firing_alarms" msgid="4986161963178722289">"Geen actieve wekkers"</string>
     <string name="alarm_is_snoozed" msgid="7044644119744928846">"<xliff:g id="ALARM_TIME">%s</xliff:g> wekker tien minuten gesnoozed"</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 485da4673..0fc05e646 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- 
   Copyright (C) 2016 The Android Open Source Project
 
@@ -13,10 +13,7 @@
   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.
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+   --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="6674495003718166674">"Часы"</string>
     <string name="label" msgid="162189613902857319">"Описание"</string>
     <string name="default_label" msgid="5590025289805630372">"Будильник"</string>
@@ -29,34 +26,34 @@
     <string name="add_new_sound" msgid="2546936797351540244">"Добавить"</string>
     <string name="remove_sound" msgid="2064643204455734239">"Удалить"</string>
     <string name="confirm_remove_custom_ringtone" msgid="1724111242265208553">"Будильники и таймеры, для которых выбран этот сигнал, будут воспроизводить звук, настроенный по умолчанию."</string>
-    <string name="your_sounds" msgid="1672779351352629681">"Ваши звуковые сигналы"</string>
-    <string name="device_sounds" msgid="1584894148222639823">"Звуковые сигналы устройства"</string>
-    <string name="custom_ringtone_lost_permissions" msgid="3406310054255354331">"У приложения нет доступа к звуковым сигналам."</string>
-    <string name="default_timer_ringtone_title" msgid="1370799536406862317">"Время истекло"</string>
-    <string name="alarm_tomorrow" msgid="131356848787643420">"Завтра"</string>
-    <string name="alarm_today" msgid="7873594221106531654">"Сегодня"</string>
-    <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Выключить"</string>
-    <string name="alarm_missed_title" msgid="3828345099754063392">"Пропущенный будильник"</string>
+    <string name="your_sounds" msgid="1672779351352629681">Ваши звуковые сигналы</string>
+    <string name="device_sounds" msgid="1584894148222639823">Звуковые сигналы устройства</string>
+    <string name="custom_ringtone_lost_permissions" msgid="3406310054255354331">У приложения нет доступа к звуковым сигналам.</string>
+    <string name="default_timer_ringtone_title" msgid="1370799536406862317">Время истекло</string>
+    <string name="alarm_tomorrow" msgid="131356848787643420">Завтра</string>
+    <string name="alarm_today" msgid="7873594221106531654">Сегодня</string>
+    <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">Выключить</string>
+    <string name="alarm_missed_title" msgid="3828345099754063392">Пропущенный будильник</string>
     <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
-    <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Отложено"</string>
+    <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">Отложено</string>
     <plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
-      <item quantity="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">%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>
     </plurals>
-    <string name="alarm_alert_off_text" msgid="4472073417593915002">"Выключено"</string>
-    <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Отложить"</string>
+    <string name="alarm_alert_off_text" msgid="4472073417593915002">Выключено</string>
+    <string name="alarm_alert_snooze_text" msgid="1774416052207651584">Отложить</string>
     <plurals name="alarm_alert_snooze_set" formatted="false" msgid="3212729193036041768">
-      <item quantity="one">Повтор через <xliff:g id="MINUTES">%d</xliff:g> минуту</item>
-      <item quantity="few">Повтор через <xliff:g id="MINUTES">%d</xliff:g> минуты</item>
-      <item quantity="many">Повтор через <xliff:g id="MINUTES">%d</xliff:g> минут</item>
-      <item quantity="other">Повтор через <xliff:g id="MINUTES">%d</xliff:g> минуты</item>
+        <item quantity="one">Повтор через 1 минуту.</item>
+        <item quantity="few">Повтор через <xliff:g id="minutes">%d</xliff:g> минуты.</item>
+        <item quantity="many">Повтор через <xliff:g id="minutes">%d</xliff:g> минут.</item>
+        <item quantity="other">Повтор через <xliff:g id="minutes">%d</xliff:g> минут.</item>
     </plurals>
-    <string name="alarm_alert_snooze_until" msgid="6958013659168344550">"Повтор в <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="alarm_alert_predismiss_title" msgid="5723945586913705445">"Следующий будильник"</string>
-    <string name="missed_alarm_has_been_deleted" msgid="5295473204045979335">"Пропущенный будильник был удален"</string>
-    <string name="timer_notifications_less_min" msgid="5481375048976427255">"Осталось: меньше минуты"</string>
+    <string name="alarm_alert_snooze_until" msgid="6958013659168344550">Повтор в <xliff:g id="TIME">%s</xliff:g></string>
+    <string name="alarm_alert_predismiss_title" msgid="5723945586913705445">Следующий будильник</string>
+    <string name="missed_alarm_has_been_deleted" msgid="5295473204045979335">Пропущенный будильник был удален</string>
+    <string name="timer_notifications_less_min" msgid="5481375048976427255">Осталось: меньше минуты</string>
     <string name="timer_notifications_hours" msgid="1613266446037145138">"<xliff:g id="REMAINING"> %3$s</xliff:g> <xliff:g id="HOURS">%1$s</xliff:g>"</string>
     <string name="timer_notifications_minutes" msgid="8543138714519498893">"<xliff:g id="REMAINING"> %3$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g>"</string>
     <string name="timer_notifications_hours_minutes" msgid="4788475350933275505">"Осталось: <xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES"> %2$s</xliff:g>"</string>
@@ -69,130 +66,130 @@
     <string name="timer_accessibility_started" msgid="8503877052873671219">"Таймер включен, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="timer_remaining_single" msgid="6782851171906765864">"Осталось:"</string>
     <string name="timer_remaining_multiple" msgid="6052775962092160851">"Осталось:"</string>
-  <string-array name="alarm_set">
-    <item msgid="6450913786084215050">"Будильник зазвонит менее чем через минуту."</item>
-    <item msgid="6002066367368421848">"Будильник зазвонит через <xliff:g id="DAYS">%1$s</xliff:g>"</item>
-    <item msgid="8824719306247973774">"Будильник зазвонит через <xliff:g id="HOURS">%2$s</xliff:g>"</item>
-    <item msgid="8182406852935468862">"Будильник зазвонит через <xliff:g id="DAYS">%1$s</xliff:g> и <xliff:g id="HOURS">%2$s</xliff:g>"</item>
-    <item msgid="2532279224777213194">"Будильник зазвонит через <xliff:g id="MINUTES">%3$s</xliff:g>"</item>
-    <item msgid="5936557894247187717">"Будильник зазвонит через <xliff:g id="DAYS">%1$s</xliff:g> и <xliff:g id="MINUTES">%3$s</xliff:g>"</item>
-    <item msgid="9115697840826129603">"Будильник зазвонит через <xliff:g id="HOURS">%2$s</xliff:g> и <xliff:g id="MINUTES">%3$s</xliff:g>"</item>
-    <item msgid="2332583385137381060">"Будильник зазвонит через <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> и <xliff:g id="MINUTES">%3$s</xliff:g>"</item>
-  </string-array>
+    <string-array name="alarm_set">
+        <item msgid="6450913786084215050">"Будильник зазвонит менее чем через минуту."</item>
+        <item msgid="6002066367368421848">"Будильник зазвонит через <xliff:g id="DAYS">%1$s</xliff:g>"</item>
+        <item msgid="8824719306247973774">"Будильник зазвонит через <xliff:g id="HOURS">%2$s</xliff:g>"</item>
+        <item msgid="8182406852935468862">"Будильник зазвонит через <xliff:g id="DAYS">%1$s</xliff:g> и <xliff:g id="HOURS">%2$s</xliff:g>"</item>
+        <item msgid="2532279224777213194">"Будильник зазвонит через <xliff:g id="MINUTES">%3$s</xliff:g>"</item>
+        <item msgid="5936557894247187717">"Будильник зазвонит через <xliff:g id="DAYS">%1$s</xliff:g> и <xliff:g id="MINUTES">%3$s</xliff:g>"</item>
+        <item msgid="9115697840826129603">"Будильник зазвонит через <xliff:g id="HOURS">%2$s</xliff:g> и <xliff:g id="MINUTES">%3$s</xliff:g>"</item>
+        <item msgid="2332583385137381060">"Будильник зазвонит через <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> и <xliff:g id="MINUTES">%3$s</xliff:g>"</item>
+    </string-array>
     <plurals name="days" formatted="false" msgid="3706846447285206235">
-      <item quantity="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>
+        <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>
+        <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_short" formatted="false" msgid="3709250715691092925">
-      <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>
+        <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>
+        <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_short" formatted="false" msgid="6397328304369080233">
-      <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>
+        <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="seconds" formatted="false" msgid="670343577734266047">
-      <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>
+        <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="every_day" msgid="4100909974923444602">Каждый день</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
-    <string name="loading_widget" msgid="5306242862476796500">"Загрузка…"</string>
-    <string name="analog_gadget" msgid="1670505720837152766">"Часы"</string>
-    <string name="digital_gadget" msgid="2326954556720571358">"Часы"</string>
+    <string name="loading_widget" msgid="5306242862476796500">Загрузка…</string>
+    <string name="analog_gadget" msgid="1670505720837152766">Аналоговые часы</string>
+    <string name="digital_gadget" msgid="2326954556720571358">Цифровые часы</string>
     <string name="settings" msgid="5849739030579520686">"Настройки"</string>
-    <string name="snooze_duration_title" msgid="1097309861110780483">"Интервал повтора сигнала"</string>
-    <string name="crescendo_duration_title" msgid="8606408542726189528">"Постепенно увеличивать громкость"</string>
-    <string name="auto_silence_title" msgid="2012754009554434544">"Автовыключение"</string>
+    <string name="snooze_duration_title" msgid="1097309861110780483">Интервал повтора сигнала</string>
+    <string name="crescendo_duration_title" msgid="8606408542726189528">Постепенно увеличивать громкость</string>
+    <string name="auto_silence_title" msgid="2012754009554434544">Автовыключение</string>
     <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
-      <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>
+        <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>
-    <item msgid="5431906692406316549">"5 минут"</item>
-    <item msgid="7742728812068919959">"10 минут"</item>
-    <item msgid="2855948657259647629">"15 минут"</item>
-    <item msgid="6330196381284475079">"20 минут"</item>
-    <item msgid="7809240121716151904">"25 минут"</item>
-    <item msgid="4278641338024561333">"Никогда"</item>
-  </string-array>
-  <string-array name="crescendo_entries">
-    <item msgid="7435149932182641128">"Выкл."</item>
-    <item msgid="7195451681426992018">"5 секунд"</item>
-    <item msgid="592917601923801901">"10 секунд"</item>
-    <item msgid="5050318776687582653">"15 секунд"</item>
-    <item msgid="6997726466563948756">"20 секунд"</item>
-    <item msgid="1237360231425097772">"25 секунд"</item>
-    <item msgid="248014374051498284">"30 секунд"</item>
-    <item msgid="6110450211551791852">"35 секунд"</item>
-    <item msgid="8010211657612404516">"40 секунд"</item>
-    <item msgid="3730631498119797451">"45 секунд"</item>
-    <item msgid="623829984393124488">"50 секунд"</item>
-    <item msgid="6390209981529164605">"55 секунд"</item>
-    <item msgid="5261571706794132923">"60 секунд"</item>
-  </string-array>
-  <string-array name="snooze_duration_entries">
-    <item msgid="7668553664977446797">"1 минута"</item>
-    <item msgid="4482596794620161030">"2 минуты"</item>
-    <item msgid="8478276201849960314">"3 минуты"</item>
-    <item msgid="4038456474851212478">"4 минуты"</item>
-    <item msgid="6298175579152122770">"5 минут"</item>
-    <item msgid="9021860177999278496">"6 минут"</item>
-    <item msgid="7224689200902680256">"7 минут"</item>
-    <item msgid="4610012663985162123">"8 минут"</item>
-    <item msgid="1717028898015659426">"9 минут"</item>
-    <item msgid="8058492636464337699">"10 минут"</item>
-    <item msgid="577767219993868603">"11 минут"</item>
-    <item msgid="3710047869487864775">"12  минут"</item>
-    <item msgid="3794200935630619331">"13 минут"</item>
-    <item msgid="5462266433522229437">"14 минут"</item>
-    <item msgid="2192100038569306041">"15 минут"</item>
-    <item msgid="6636326047858437620">"16 минут"</item>
-    <item msgid="2481054808772108352">"17 минут"</item>
-    <item msgid="4080984064428458050">"18 минут"</item>
-    <item msgid="5844319398703041730">"19 минут"</item>
-    <item msgid="2334964289857921073">"20 минут"</item>
-    <item msgid="4755209855817904977">"21 минута"</item>
-    <item msgid="8414394445389367355">"22 минуты"</item>
-    <item msgid="2604612428763230265">"23 минуты"</item>
-    <item msgid="6871696471373403806">"24 минуты"</item>
-    <item msgid="1573685398431466364">"25 минут"</item>
-    <item msgid="6999090368236684971">"26 минут"</item>
-    <item msgid="7125056720603734703">"27 минут"</item>
-    <item msgid="1695830988496463030">"28 минут"</item>
-    <item msgid="6706610539793025916">"29 минут"</item>
-    <item msgid="2898212818965905529">"30 минут"</item>
-  </string-array>
-    <string name="week_start_title" msgid="4268917518596832096">"Начало недели"</string>
-  <string-array name="week_start_entries">
-    <item msgid="9010198173394482639">"суббота"</item>
-    <item msgid="3993530639455360921">"воскресенье"</item>
-    <item msgid="8594709368683324282">"понедельник"</item>
-  </string-array>
+    <string name="auto_silence_never" msgid="4821982647348750809">Отключено</string>
+    <string-array name="auto_silence_entries">
+        <item msgid="3024545954917711306">"1 минута"</item>
+        <item msgid="5431906692406316549">"5 минут"</item>
+        <item msgid="7742728812068919959">"10 минут"</item>
+        <item msgid="2855948657259647629">"15 минут"</item>
+        <item msgid="6330196381284475079">"20 минут"</item>
+        <item msgid="7809240121716151904">"25 минут"</item>
+        <item msgid="4278641338024561333">"Никогда"</item>
+    </string-array>
+    <string-array name="crescendo_entries">
+        <item msgid="7435149932182641128">"Выкл."</item>
+        <item msgid="7195451681426992018">"5 секунд"</item>
+        <item msgid="592917601923801901">"10 секунд"</item>
+        <item msgid="5050318776687582653">"15 секунд"</item>
+        <item msgid="6997726466563948756">"20 секунд"</item>
+        <item msgid="1237360231425097772">"25 секунд"</item>
+        <item msgid="248014374051498284">"30 секунд"</item>
+        <item msgid="6110450211551791852">"35 секунд"</item>
+        <item msgid="8010211657612404516">"40 секунд"</item>
+        <item msgid="3730631498119797451">"45 секунд"</item>
+        <item msgid="623829984393124488">"50 секунд"</item>
+        <item msgid="6390209981529164605">"55 секунд"</item>
+        <item msgid="5261571706794132923">"60 секунд"</item>
+    </string-array>
+    <string-array name="snooze_duration_entries">
+        <item msgid="7668553664977446797">"1 минута"</item>
+        <item msgid="4482596794620161030">"2 минуты"</item>
+        <item msgid="8478276201849960314">"3 минуты"</item>
+        <item msgid="4038456474851212478">"4 минуты"</item>
+        <item msgid="6298175579152122770">"5 минут"</item>
+        <item msgid="9021860177999278496">"6 минут"</item>
+        <item msgid="7224689200902680256">"7 минут"</item>
+        <item msgid="4610012663985162123">"8 минут"</item>
+        <item msgid="1717028898015659426">"9 минут"</item>
+        <item msgid="8058492636464337699">"10 минут"</item>
+        <item msgid="577767219993868603">"11 минут"</item>
+        <item msgid="3710047869487864775">"12  минут"</item>
+        <item msgid="3794200935630619331">"13 минут"</item>
+        <item msgid="5462266433522229437">"14 минут"</item>
+        <item msgid="2192100038569306041">"15 минут"</item>
+        <item msgid="6636326047858437620">"16 минут"</item>
+        <item msgid="2481054808772108352">"17 минут"</item>
+        <item msgid="4080984064428458050">"18 минут"</item>
+        <item msgid="5844319398703041730">"19 минут"</item>
+        <item msgid="2334964289857921073">"20 минут"</item>
+        <item msgid="4755209855817904977">"21 минута"</item>
+        <item msgid="8414394445389367355">"22 минуты"</item>
+        <item msgid="2604612428763230265">"23 минуты"</item>
+        <item msgid="6871696471373403806">"24 минуты"</item>
+        <item msgid="1573685398431466364">"25 минут"</item>
+        <item msgid="6999090368236684971">"26 минут"</item>
+        <item msgid="7125056720603734703">"27 минут"</item>
+        <item msgid="1695830988496463030">"28 минут"</item>
+        <item msgid="6706610539793025916">"29 минут"</item>
+        <item msgid="2898212818965905529">"30 минут"</item>
+    </string-array>
+    <string name="week_start_title" msgid="4268917518596832096">Начало недели</string>
+    <string-array name="week_start_entries">
+        <item msgid="9010198173394482639">"суббота"</item>
+        <item msgid="3993530639455360921">"воскресенье"</item>
+        <item msgid="8594709368683324282">"понедельник"</item>
+    </string-array>
     <string name="alarm_volume_title" msgid="8506245173912428522">"Громкость будильника"</string>
     <string name="silent_ringtone_title" msgid="6177287302898634765">"Без звука"</string>
     <string name="unknown_ringtone_title" msgid="6637522029614550112">"Неизвестно"</string>
@@ -203,11 +200,11 @@
     <string name="app_notifications_blocked" msgid="7249150789023936889">"Уведомления от часов заблокированы."</string>
     <string name="alarms_blocked_by_dnd" msgid="6089433757505898969">"Включен режим \"Полная тишина\""</string>
     <string name="volume_button_setting_title" msgid="6937131248843413357">"Кнопки громкости"</string>
-  <string-array name="volume_button_setting_entries">
-    <item msgid="7972756698723318690">"Отложить"</item>
-    <item msgid="3450979320164769576">"Выключить"</item>
-    <item msgid="7085774139907653538">"Изменить громкость"</item>
-  </string-array>
+    <string-array name="volume_button_setting_entries">
+        <item msgid="7972756698723318690">"Отложить"</item>
+        <item msgid="3450979320164769576">"Выключить"</item>
+        <item msgid="7085774139907653538">"Изменить громкость"</item>
+    </string-array>
     <string name="label_description" msgid="8736179296142915727">"Ярлык"</string>
     <string name="ringtone_description" msgid="7580922112921069925">"Рингтон"</string>
     <string name="menu_alarm" msgid="4772010125376647519">"Будильник"</string>
@@ -260,122 +257,122 @@
     <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
     <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <!-- no translation found for seconds (6550091082396571898) -->
-    <skip />
-  <string-array name="sw_share_strings">
-    <item msgid="842841032273927988">"Да вы просто Шумахер!"</item>
-    <item msgid="6332879039890727169">"Вы славно потрудились!"</item>
-    <item msgid="815382761274660130">"Вы даже быстрее, чем Android!"</item>
-    <item msgid="7916250650982813737">"Уф!"</item>
-    <item msgid="6836603904515182333">"L33t раз(а)"</item>
-    <item msgid="7508085100680861631">"Вот это скорость!"</item>
-    <item msgid="5961245252909589573">"Искажение времени – то, что нам нужно!"</item>
-    <item msgid="5211891900854545940">"Прыжок влево"</item>
-    <item msgid="9071353477103826053">"Вы времени даром не теряете!"</item>
-    <item msgid="3785193933691117181">"Быстрее света!"</item>
-  </string-array>
+    <skip/>
+    <string-array name="sw_share_strings">
+        <item msgid="842841032273927988">"Да вы просто Шумахер!"</item>
+        <item msgid="6332879039890727169">"Вы славно потрудились!"</item>
+        <item msgid="815382761274660130">"Вы даже быстрее, чем Android!"</item>
+        <item msgid="7916250650982813737">"Уф!"</item>
+        <item msgid="6836603904515182333">"L33t раз(а)"</item>
+        <item msgid="7508085100680861631">"Вот это скорость!"</item>
+        <item msgid="5961245252909589573">"Искажение времени – то, что нам нужно!"</item>
+        <item msgid="5211891900854545940">"Прыжок влево"</item>
+        <item msgid="9071353477103826053">"Вы времени даром не теряете!"</item>
+        <item msgid="3785193933691117181">"Быстрее света!"</item>
+    </string-array>
     <string name="home_label" msgid="4436139365695453870">"Дома"</string>
     <string name="cities_activity_title" msgid="8552462751129256730">"Города"</string>
     <string name="clock_settings" msgid="8317286807280600391">"Часы"</string>
     <string name="clock_style" msgid="2265011060429742344">"Стиль"</string>
     <string name="display_clock_seconds_pref" msgid="691506643469501643">"Показывать секунды"</string>
     <string name="open_date_settings" msgid="7712226973337806152">"Изменить дату и время"</string>
-  <string-array name="clock_style_entries">
-    <item msgid="917900462224167608">"Стрелки"</item>
-    <item msgid="8483930821046925592">"Цифры"</item>
-  </string-array>
+    <string-array name="clock_style_entries">
+        <item msgid="917900462224167608">"Стрелки"</item>
+        <item msgid="8483930821046925592">"Цифры"</item>
+    </string-array>
     <string name="automatic_home_clock" msgid="6274174710735449252">"Показывать время дома"</string>
     <string name="automatic_home_clock_summary" msgid="6020476321040807273">"Показывать на отдельных часах, сколько времени дома, когда я нахожусь в другом часовом поясе"</string>
     <string name="home_time_zone" msgid="9199730676287974501">"Мой часовой пояс"</string>
     <string name="home_time_zone_title" msgid="807894493443834624">"Мой часовой пояс"</string>
     <string name="city_checked" msgid="616847871968019">"<xliff:g id="CITY_NAME">%s</xliff:g>, выбрано"</string>
     <string name="city_unchecked" msgid="710212932781145918">"<xliff:g id="CITY_NAME">%s</xliff:g>, выбор отменен"</string>
-  <string-array name="timezone_labels">
-    <item msgid="5495601234086197399">"Маршалловы Острова"</item>
-    <item msgid="4196408495909011020">"Остров Мидуэй"</item>
-    <item msgid="1414384194857730006">"Гавайи"</item>
-    <item msgid="2687091371581931926">"Аляска"</item>
-    <item msgid="1922100269679049660">"Тихоокеанское время"</item>
-    <item msgid="7156402158716866161">"Тихуана"</item>
-    <item msgid="1144117502254612241">"Аризона"</item>
-    <item msgid="101284182011722637">"Чиуауа"</item>
-    <item msgid="689121094232986897">"Горное время (США)"</item>
-    <item msgid="5445331923942302756">"Центральноамер. время"</item>
-    <item msgid="2749806434052452351">"Центральное время"</item>
-    <item msgid="3997138870229703753">"Мехико"</item>
-    <item msgid="5425567073027744888">"Саскачеван"</item>
-    <item msgid="2877342865396629368">"Богота"</item>
-    <item msgid="568682398893899670">"Восточное время"</item>
-    <item msgid="668135984541863866">"Венесуэла"</item>
-    <item msgid="3737474220861486223">"Атлант. время (Барбадос)"</item>
-    <item msgid="6279116051273436870">"Атлант. время (Канада)"</item>
-    <item msgid="8513382867172014244">"Манаус"</item>
-    <item msgid="7776299003105932407">"Сантьяго"</item>
-    <item msgid="8636989494746218677">"Ньюфаундленд"</item>
-    <item msgid="4402541016410147505">"Бразилиа"</item>
-    <item msgid="2251184440733164084">"Буэнос-Айрес"</item>
-    <item msgid="6202926618569004969">"Гренландия"</item>
-    <item msgid="2355275037115290628">"Монтевидео"</item>
-    <item msgid="1377549694711708945">"Центральноатлант. время"</item>
-    <item msgid="3457671272126347981">"Азорские острова"</item>
-    <item msgid="3659315141063710840">"Кабо-Верде"</item>
-    <item msgid="1260941741802367635">"Касабланка"</item>
-    <item msgid="8275203689687954762">"Лондон, Дублин"</item>
-    <item msgid="5970179539479320905">"Амстердам, Берлин"</item>
-    <item msgid="5396319478750517962">"Белград"</item>
-    <item msgid="8688787475056663004">"Брюссель"</item>
-    <item msgid="3415827874921681622">"Сараево"</item>
-    <item msgid="402008965928320066">"Виндхук"</item>
-    <item msgid="6436942724959275569">"Западноафриканское время"</item>
-    <item msgid="954536568417204026">"Амман"</item>
-    <item msgid="8932745482008902551">"Афины, Стамбул"</item>
-    <item msgid="320025725949024510">"Бейрут, Ливан"</item>
-    <item msgid="7242083112551905970">"Каир"</item>
-    <item msgid="7241520146011450419">"Хельсинки"</item>
-    <item msgid="2717065017510546526">"Иерусалим"</item>
-    <item msgid="8698556287741466553">"Минск"</item>
-    <item msgid="1797598357342084506">"Хараре"</item>
-    <item msgid="5169119919905066998">"Багдад"</item>
-    <item msgid="2615788116201065182">"Москва"</item>
-    <item msgid="9084354867885584646">"Кувейт"</item>
-    <item msgid="1351570519986178268">"Найроби"</item>
-    <item msgid="7094569580635877460">"Тегеран"</item>
-    <item msgid="3953138772617909704">"Баку"</item>
-    <item msgid="2868893113598800752">"Тбилиси"</item>
-    <item msgid="7088581865802476373">"Ереван"</item>
-    <item msgid="1941122257623887992">"Дубай"</item>
-    <item msgid="9194797225058249720">"Кабул"</item>
-    <item msgid="6486569254364577332">"Исламабад, Карачи"</item>
-    <item msgid="5487724896895412089">"Уральск"</item>
-    <item msgid="364906869710826982">"Екатеринбург"</item>
-    <item msgid="2106505051751383358">"Калькутта"</item>
-    <item msgid="6851586621581501447">"Шри-Ланка"</item>
-    <item msgid="800438544128213134">"Катманду"</item>
-    <item msgid="6173621471007643021">"Астана"</item>
-    <item msgid="8645125891971581128">"Янгон"</item>
-    <item msgid="2886407505119737794">"Красноярск"</item>
-    <item msgid="3408222398188107090">"Бангкок"</item>
-    <item msgid="4441612937172851228">"Пекин"</item>
-    <item msgid="4936715789028996930">"Гонконг"</item>
-    <item msgid="4261031143777385525">"Иркутск"</item>
-    <item msgid="3538060959338191835">"Куала-Лумпур"</item>
-    <item msgid="1438847562643099201">"Перт"</item>
-    <item msgid="3063913827688244383">"Тайбэй"</item>
-    <item msgid="3502757135046564209">"Сеул"</item>
-    <item msgid="6107588684519111669">"Токио, Осака"</item>
-    <item msgid="4350769099755608471">"Якутск"</item>
-    <item msgid="2422707004533526462">"Аделаида"</item>
-    <item msgid="1292192084554134339">"Дарвин"</item>
-    <item msgid="1320883699470001716">"Брисбен"</item>
-    <item msgid="5137198806146386527">"Хобарт"</item>
-    <item msgid="5920063686933941174">"Сидней, Канберра"</item>
-    <item msgid="615906039696009425">"Владивосток"</item>
-    <item msgid="7738680449356275374">"Гуам"</item>
-    <item msgid="2882915026380778227">"Магадан"</item>
-    <item msgid="8255615641810148152">"Окленд"</item>
-    <item msgid="3027153773466391728">"Фиджи"</item>
-    <item msgid="5911600083231840181">"Тонга"</item>
-    <item msgid="5176858645450908751">"Джакарта"</item>
-  </string-array>
+    <string-array name="timezone_labels">
+        <item msgid="5495601234086197399">"Маршалловы Острова"</item>
+        <item msgid="4196408495909011020">"Остров Мидуэй"</item>
+        <item msgid="1414384194857730006">"Гавайи"</item>
+        <item msgid="2687091371581931926">"Аляска"</item>
+        <item msgid="1922100269679049660">"Тихоокеанское время"</item>
+        <item msgid="7156402158716866161">"Тихуана"</item>
+        <item msgid="1144117502254612241">"Аризона"</item>
+        <item msgid="101284182011722637">"Чиуауа"</item>
+        <item msgid="689121094232986897">"Горное время (США)"</item>
+        <item msgid="5445331923942302756">"Центральноамер. время"</item>
+        <item msgid="2749806434052452351">"Центральное время"</item>
+        <item msgid="3997138870229703753">"Мехико"</item>
+        <item msgid="5425567073027744888">"Саскачеван"</item>
+        <item msgid="2877342865396629368">"Богота"</item>
+        <item msgid="568682398893899670">"Восточное время"</item>
+        <item msgid="668135984541863866">"Венесуэла"</item>
+        <item msgid="3737474220861486223">"Атлант. время (Барбадос)"</item>
+        <item msgid="6279116051273436870">"Атлант. время (Канада)"</item>
+        <item msgid="8513382867172014244">"Манаус"</item>
+        <item msgid="7776299003105932407">"Сантьяго"</item>
+        <item msgid="8636989494746218677">"Ньюфаундленд"</item>
+        <item msgid="4402541016410147505">"Бразилиа"</item>
+        <item msgid="2251184440733164084">"Буэнос-Айрес"</item>
+        <item msgid="6202926618569004969">"Гренландия"</item>
+        <item msgid="2355275037115290628">"Монтевидео"</item>
+        <item msgid="1377549694711708945">"Центральноатлант. время"</item>
+        <item msgid="3457671272126347981">"Азорские острова"</item>
+        <item msgid="3659315141063710840">"Кабо-Верде"</item>
+        <item msgid="1260941741802367635">"Касабланка"</item>
+        <item msgid="8275203689687954762">"Лондон, Дублин"</item>
+        <item msgid="5970179539479320905">"Амстердам, Берлин"</item>
+        <item msgid="5396319478750517962">"Белград"</item>
+        <item msgid="8688787475056663004">"Брюссель"</item>
+        <item msgid="3415827874921681622">"Сараево"</item>
+        <item msgid="402008965928320066">"Виндхук"</item>
+        <item msgid="6436942724959275569">"Западноафриканское время"</item>
+        <item msgid="954536568417204026">"Амман"</item>
+        <item msgid="8932745482008902551">"Афины, Стамбул"</item>
+        <item msgid="320025725949024510">"Бейрут, Ливан"</item>
+        <item msgid="7242083112551905970">"Каир"</item>
+        <item msgid="7241520146011450419">"Хельсинки"</item>
+        <item msgid="2717065017510546526">"Иерусалим"</item>
+        <item msgid="8698556287741466553">"Минск"</item>
+        <item msgid="1797598357342084506">"Хараре"</item>
+        <item msgid="5169119919905066998">"Багдад"</item>
+        <item msgid="2615788116201065182">"Москва"</item>
+        <item msgid="9084354867885584646">"Кувейт"</item>
+        <item msgid="1351570519986178268">"Найроби"</item>
+        <item msgid="7094569580635877460">"Тегеран"</item>
+        <item msgid="3953138772617909704">"Баку"</item>
+        <item msgid="2868893113598800752">"Тбилиси"</item>
+        <item msgid="7088581865802476373">"Ереван"</item>
+        <item msgid="1941122257623887992">"Дубай"</item>
+        <item msgid="9194797225058249720">"Кабул"</item>
+        <item msgid="6486569254364577332">"Исламабад, Карачи"</item>
+        <item msgid="5487724896895412089">"Уральск"</item>
+        <item msgid="364906869710826982">"Екатеринбург"</item>
+        <item msgid="2106505051751383358">"Калькутта"</item>
+        <item msgid="6851586621581501447">"Шри-Ланка"</item>
+        <item msgid="800438544128213134">"Катманду"</item>
+        <item msgid="6173621471007643021">"Астана"</item>
+        <item msgid="8645125891971581128">"Янгон"</item>
+        <item msgid="2886407505119737794">"Красноярск"</item>
+        <item msgid="3408222398188107090">"Бангкок"</item>
+        <item msgid="4441612937172851228">"Пекин"</item>
+        <item msgid="4936715789028996930">"Гонконг"</item>
+        <item msgid="4261031143777385525">"Иркутск"</item>
+        <item msgid="3538060959338191835">"Куала-Лумпур"</item>
+        <item msgid="1438847562643099201">"Перт"</item>
+        <item msgid="3063913827688244383">"Тайбэй"</item>
+        <item msgid="3502757135046564209">"Сеул"</item>
+        <item msgid="6107588684519111669">"Токио, Осака"</item>
+        <item msgid="4350769099755608471">"Якутск"</item>
+        <item msgid="2422707004533526462">"Аделаида"</item>
+        <item msgid="1292192084554134339">"Дарвин"</item>
+        <item msgid="1320883699470001716">"Брисбен"</item>
+        <item msgid="5137198806146386527">"Хобарт"</item>
+        <item msgid="5920063686933941174">"Сидней, Канберра"</item>
+        <item msgid="615906039696009425">"Владивосток"</item>
+        <item msgid="7738680449356275374">"Гуам"</item>
+        <item msgid="2882915026380778227">"Магадан"</item>
+        <item msgid="8255615641810148152">"Окленд"</item>
+        <item msgid="3027153773466391728">"Фиджи"</item>
+        <item msgid="5911600083231840181">"Тонга"</item>
+        <item msgid="5176858645450908751">"Джакарта"</item>
+    </string-array>
     <string name="shortcut_new_alarm_short" msgid="3490418929139725538">"Новый будильник"</string>
     <string name="shortcut_new_alarm_long" msgid="4778064830147981089">"Установить будильник"</string>
     <string name="shortcut_new_timer_short" msgid="3793414543219297884">"Новый таймер"</string>
@@ -428,10 +425,10 @@
     <string name="alarm_is_set" msgid="5503226382620011088">"Будильник зазвонит в <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
     <string name="timer_created" msgid="4381027137335885547">"Таймер создан"</string>
     <plurals name="expired_timers_dismissed" formatted="false" msgid="1294953410988488149">
-      <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">Таймер выключен</item>
+        <item quantity="few"><xliff:g id="NUMBER" example="3">%d</xliff:g> таймера выключено</item>
+        <item quantity="many"><xliff:g id="NUMBER" example="5">%d</xliff:g> таймеров выключено</item>
+        <item quantity="other"><xliff:g id="NUMBER" example="5">%d</xliff:g> таймеров выключено</item>
     </plurals>
     <string name="timer_deleted" msgid="9110322362460029392">"Таймер удален"</string>
     <string name="invalid_timer_length" msgid="3104567893212932487">"Недопустимая длительность таймера"</string>
@@ -442,4 +439,4 @@
     <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>
+</resources>
\ No newline at end of file
-- 
GitLab