Merge branch 'lineage-17.1' of https://github.com/LineageOS/android_packages_apps_DeskClock into int/10/fp2
Issue: FP2A10-173
Change-Id: Iec47bffc43035300f1b9ec32a898c369919b4958
diff --git a/Android.bp b/Android.bp
index ec6d1fe..2d27ae9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -26,4 +26,15 @@
"androidx.gridlayout_gridlayout",
"androidx.recyclerview_recyclerview",
],
+ required: [
+ "com.android.deskclock_whitelist"
+ ],
+}
+
+prebuilt_etc {
+ name: "com.android.deskclock_whitelist",
+ product_specific: true,
+ sub_dir: "sysconfig",
+ src: "com.android.deskclock_whitelist.xml",
+ filename_from_src: true,
}
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1213ea3..aa784bb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,13 +22,17 @@
<original-package android:name="com.android.alarmclock" />
<original-package android:name="com.android.deskclock" />
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
+ <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+ <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
+ <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+ <uses-permission android:name="org.codeaurora.permission.POWER_OFF_ALARM" />
<!-- WRITE_SETTINGS is required to record the upcoming alarm prior to L -->
<uses-permission
@@ -45,6 +49,7 @@
android:backupAgent="DeskClockBackupAgent"
android:fullBackupContent="@xml/backup_scheme"
android:fullBackupOnly="true"
+ android:appCategory="productivity"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_label"
android:requiredForAllUsers="true"
@@ -102,9 +107,12 @@
<!-- ============================================================== -->
<activity
- android:name=".HandleApiCalls"
+ android:name="com.android.deskclock.HandleApiCalls"
+ android:permission="com.android.alarm.permission.SET_ALARM"
+ android:directBootAware="true"
android:excludeFromRecents="true"
android:launchMode="singleInstance"
+ android:showWhenLocked="true"
android:taskAffinity=""
android:theme="@android:style/Theme.NoDisplay">
<intent-filter>
@@ -120,9 +128,9 @@
</activity>
<activity-alias
- android:name=".HandleSetAlarmApiCalls"
+ android:name="com.android.deskclock.HandleSetAlarmApiCalls"
android:permission="com.android.alarm.permission.SET_ALARM"
- android:targetActivity=".HandleApiCalls">
+ android:targetActivity="com.android.deskclock.HandleApiCalls">
<intent-filter>
<action android:name="android.intent.action.SET_ALARM" />
<action android:name="android.intent.action.SET_TIMER" />
@@ -142,6 +150,7 @@
android:excludeFromRecents="true"
android:resizeableActivity="false"
android:showOnLockScreen="true"
+ android:showWhenLocked="true"
android:taskAffinity=""
android:windowSoftInputMode="stateAlwaysHidden" />
@@ -166,6 +175,7 @@
<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
<action android:name="android.intent.action.TIME_SET" />
<action android:name="android.intent.action.TIMEZONE_CHANGED" />
+ <action android:name="org.codeaurora.poweroffalarm.action.UPDATE_ALARM" />
</intent-filter>
</receiver>
diff --git a/res/values-sw360dp-land/dimens.xml b/com.android.deskclock_whitelist.xml
similarity index 80%
rename from res/values-sw360dp-land/dimens.xml
rename to com.android.deskclock_whitelist.xml
index 33bf986..da2015f 100644
--- a/res/values-sw360dp-land/dimens.xml
+++ b/com.android.deskclock_whitelist.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<!--
+ Copyright (C) 2019-2020 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,7 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources>
- <dimen name="timer_setup_digit_font_size">40sp</dimen>
-</resources>
+<config>
+ <allow-in-power-save package="com.android.deskclock" />
+</config>
diff --git a/res/color/tab_tint_color.xml b/res/color/tab_tint_color.xml
index 912a9fe..3814e50 100644
--- a/res/color/tab_tint_color.xml
+++ b/res/color/tab_tint_color.xml
@@ -15,7 +15,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:color="@color/white" />
- <item android:state_selected="true" android:color="@color/white" />
- <item android:color="@color/white_63p" />
-</selector>
\ No newline at end of file
+ <item android:state_focused="true" android:color="@color/accent_color" />
+ <item android:state_selected="true" android:color="@color/accent_color" />
+ <item android:color="@color/white_50p" />
+</selector>
diff --git a/res/drawable-hdpi/ic_add_white_24dp.png b/res/drawable-hdpi/ic_add_white_24dp.png
deleted file mode 100644
index 694179b..0000000
--- a/res/drawable-hdpi/ic_add_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl/ic_label.xml b/res/drawable-ldrtl/ic_label.xml
index 25f757f..a62018e 100644
--- a/res/drawable-ldrtl/ic_label.xml
+++ b/res/drawable-ldrtl/ic_label.xml
@@ -24,7 +24,7 @@
android:pivotX="12"
android:scaleX="-1">
<path
- android:fillColor="#FFFFFF"
- android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16z" />
+ android:fillColor="@android:color/white"
+ android:pathData="M16,17H5V7H16L19.55,12M17.63,5.84C17.27,5.33 16.67,5 16,5H5A2,2 0 0,0 3,7V17A2,2 0 0,0 5,19H16C16.67,19 17.27,18.66 17.63,18.15L22,12L17.63,5.84Z" />
</group>
</vector>
diff --git a/res/drawable-mdpi/ic_add_white_24dp.png b/res/drawable-mdpi/ic_add_white_24dp.png
deleted file mode 100644
index 3856041..0000000
--- a/res/drawable-mdpi/ic_add_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-v21/ic_add_24dp.xml b/res/drawable-v21/ic_add_24dp.xml
deleted file mode 100644
index 61ef285..0000000
--- a/res/drawable-v21/ic_add_24dp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_add_white_24dp"
- android:tint="@color/black_54p" />
diff --git a/res/drawable-v21/ic_start_24dp.xml b/res/drawable-v21/ic_start_24dp.xml
deleted file mode 100644
index ebf3083..0000000
--- a/res/drawable-v21/ic_start_24dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_start_white_24dp"
- android:tint="@color/black_54p" />
diff --git a/res/drawable-v21/ic_stop_24dp.xml b/res/drawable-v21/ic_stop_24dp.xml
deleted file mode 100644
index e3e3431..0000000
--- a/res/drawable-v21/ic_stop_24dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_stop_white_24dp"
- android:tint="@color/black_54p" />
diff --git a/res/drawable/ic_add_24dp.xml b/res/drawable/ic_add_24dp.xml
index 5a91ced..bfbe731 100644
--- a/res/drawable/ic_add_24dp.xml
+++ b/res/drawable/ic_add_24dp.xml
@@ -14,5 +14,12 @@
limitations under the License.
-->
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_add_white_24dp" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="@android:color/black"
+ android:pathData="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
+</vector>
diff --git a/res/drawable-v21/ic_pause_24dp.xml b/res/drawable/ic_add_white_24dp.xml
similarity index 67%
rename from res/drawable-v21/ic_pause_24dp.xml
rename to res/drawable/ic_add_white_24dp.xml
index 92c5e93..71ed3d7 100644
--- a/res/drawable-v21/ic_pause_24dp.xml
+++ b/res/drawable/ic_add_white_24dp.xml
@@ -13,6 +13,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_pause_white_24dp"
- android:tint="@color/black_54p" />
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
+</vector>
diff --git a/res/drawable/ic_backspace.xml b/res/drawable/ic_backspace.xml
index b4a3040..1adc2d3 100644
--- a/res/drawable/ic_backspace.xml
+++ b/res/drawable/ic_backspace.xml
@@ -24,9 +24,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFF"
- android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53
- 0.9,0.89 1.59,0.89h15c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM19,15.59L17.59,17
- 14,13.41 10.41,17 9,15.59 12.59,12 9,8.41 10.41,7 14,10.59 17.59,7 19,8.41 15.41,12
- 19,15.59z" />
+ android:fillColor="@android:color/white"
+ android:pathData="M9,15.59L12.59,12L9,8.41L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12L19,15.59L17.59,17L14,13.41L10.41,17L9,15.59zM21,6H8l-4.5,6L8,18h13V6M21,4c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2H8c-0.63,0 -1.22,-0.3 -1.6,-0.8L1,12l5.4,-7.2C6.78,4.3 7.37,4 8,4H21L21,4z" />
</vector>
diff --git a/res/drawable/ic_delete_small.xml b/res/drawable/ic_delete_small.xml
index f08114a..c167952 100644
--- a/res/drawable/ic_delete_small.xml
+++ b/res/drawable/ic_delete_small.xml
@@ -20,6 +20,12 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFFFF"
- android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
+ android:fillColor="@android:color/white"
+ android:pathData="M9,20h6c1.66,0,3-1.34,3-3V6h0.5c0.41,0,0.75-0.34,0.75-0.75S18.91,4.5,18.5,4.5H18h-3l-1-1h-4l-1,1H6H5.5 c-0.41,0-0.75,0.34-0.75,0.75S5.09,6,5.5,6H6v11C6,18.66,7.34,20,9,20z M16.5,6v11c0,0.83-0.67,1.5-1.5,1.5H9 c-0.83,0-1.5-0.67-1.5-1.5V6H16.5z" />
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M13.97,16c0.41,0,0.75-0.34,0.75-0.75v-6.5c0-0.41-0.34-0.75-0.75-0.75s-0.75,0.34-0.75,0.75v6.5 C13.22,15.66,13.55,16,13.97,16z" />
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M10,16c0.41,0,0.75-0.34,0.75-0.75v-6.5C10.75,8.34,10.41,8,10,8S9.25,8.34,9.25,8.75v6.5C9.25,15.66,9.59,16,10,16z" />
</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_label.xml b/res/drawable/ic_label.xml
index ec330fd..4a120f2 100644
--- a/res/drawable/ic_label.xml
+++ b/res/drawable/ic_label.xml
@@ -21,6 +21,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFF"
- android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16z"/>
+ android:fillColor="@android:color/white"
+ android:pathData="M16,17H5V7H16L19.55,12M17.63,5.84C17.27,5.33 16.67,5 16,5H5A2,2 0 0,0 3,7V17A2,2 0 0,0 5,19H16C16.67,19 17.27,18.66 17.63,18.15L22,12L17.63,5.84Z" />
</vector>
diff --git a/res/drawable/ic_pause_24dp.xml b/res/drawable/ic_pause_24dp.xml
index fa2e610..15bbcdd 100644
--- a/res/drawable/ic_pause_24dp.xml
+++ b/res/drawable/ic_pause_24dp.xml
@@ -1,17 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_pause_white_24dp" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="@android:color/black"
+ android:pathData="M19,19h-6L13,5h6v14zM15,17h2L17,7h-2v10zM11,19L5,19L5,5h6v14zM7,17h2L9,7L7,7v10z" />
+</vector>
diff --git a/res/drawable/ic_public.xml b/res/drawable/ic_public.xml
index ce36b36..330c831 100644
--- a/res/drawable/ic_public.xml
+++ b/res/drawable/ic_public.xml
@@ -20,6 +20,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:fillColor="#FFFFFFFF"
- android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
-</vector>
\ No newline at end of file
+ android:fillColor="@android:color/black"
+ android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zm6.93 6h-2.95c-.32-1.25-.78-2.45-1.38-3.56 1.84.63 3.37 1.91 4.33 3.56zM12 4.04c.83 1.2 1.48 2.53 1.91 3.96h-3.82c.43-1.43 1.08-2.76 1.91-3.96zM4.26 14C4.1 13.36 4 12.69 4 12s.1-1.36.26-2h3.38c-.08.66-.14 1.32-.14 2 0 .68.06 1.34.14 2H4.26zm.82 2h2.95c.32 1.25.78 2.45 1.38 3.56-1.84-.63-3.37-1.9-4.33-3.56zm2.95-8H5.08c.96-1.66 2.49-2.93 4.33-3.56C8.81 5.55 8.35 6.75 8.03 8zM12 19.96c-.83-1.2-1.48-2.53-1.91-3.96h3.82c-.43 1.43-1.08 2.76-1.91 3.96zM14.34 14H9.66c-.09-.66-.16-1.32-.16-2 0-.68.07-1.35.16-2h4.68c.09.65.16 1.32.16 2 0 .68-.07 1.34-.16 2zm.25 5.56c.6-1.11 1.06-2.31 1.38-3.56h2.95c-.96 1.65-2.49 2.93-4.33 3.56zM16.36 14c.08-.66.14-1.32.14-2 0-.68-.06-1.34-.14-2h3.38c.16.64.26 1.31.26 2s-.1 1.36-.26 2h-3.38z" />
+</vector>
diff --git a/res/drawable/ic_ringtone.xml b/res/drawable/ic_ringtone.xml
index 5fb4e4b..3b5443e 100644
--- a/res/drawable/ic_ringtone.xml
+++ b/res/drawable/ic_ringtone.xml
@@ -20,6 +20,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:fillColor="#FFFFFFFF"
- android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
+ android:fillColor="@android:color/white"
+ android:pathData="M10,21H14A2,2 0 0,1 12,23A2,2 0 0,1 10,21M21,19V20H3V19L5,17V11C5,7.9 7.03,5.17 10,4.29C10,4.19 10,4.1 10,4A2,2 0 0,1 12,2A2,2 0 0,1 14,4C14,4.1 14,4.19 14,4.29C16.97,5.17 19,7.9 19,11V17L21,19M17,11A5,5 0 0,0 12,6A5,5 0 0,0 7,11V18H17V11M19.75,3.19L18.33,4.61C20.04,6.3 21,8.6 21,11H23C23,8.07 21.84,5.25 19.75,3.19M1,11H3C3,8.6 3.96,6.3 5.67,4.61L4.25,3.19C2.16,5.25 1,8.07 1,11Z" />
</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_ringtone_not_found.xml b/res/drawable/ic_ringtone_not_found.xml
index 74a4241..bc7ceeb 100644
--- a/res/drawable/ic_ringtone_not_found.xml
+++ b/res/drawable/ic_ringtone_not_found.xml
@@ -20,6 +20,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFF"
- android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
+ android:fillColor="@android:color/white"
+ android:pathData="M12 3l0.01 10.55c-0.59-0.34-1.27-0.55-2-0.55C7.79 13 6 14.79 6 17s1.79 4 4.01 4S14 19.21 14 17V7h4V3h-6zm-10.99 16c-1.1 0-2-0.9-2-2s0.9-2 2-2 2 0.9 2 2-0.9 2-2 2z" />
</vector>
diff --git a/res/drawable/ic_ringtone_silent.xml b/res/drawable/ic_ringtone_silent.xml
index 4e6d0ab..fa62afd 100644
--- a/res/drawable/ic_ringtone_silent.xml
+++ b/res/drawable/ic_ringtone_silent.xml
@@ -20,6 +20,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFFFF"
- android:pathData="M20,18.69L7.84,6.14 5.27,3.49 4,4.76l2.8,2.8v0.01c-0.52,0.99 -0.8,2.16 -0.8,3.42v5l-2,2v1h13.73l2,2L21,19.72l-1,-1.03zM12,22c1.11,0 2,-0.89 2,-2h-4c0,1.11 0.89,2 2,2zM18,14.68L18,11c0,-3.08 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68c-0.15,0.03 -0.29,0.08 -0.42,0.12 -0.1,0.03 -0.2,0.07 -0.3,0.11h-0.01c-0.01,0 -0.01,0 -0.02,0.01 -0.23,0.09 -0.46,0.2 -0.68,0.31 0,0 -0.01,0 -0.01,0.01L18,14.68z" />
-</vector>
\ No newline at end of file
+ android:fillColor="@android:color/white"
+ android:pathData="M22.11,21.46L2.39,1.73L1.11,3L5.83,7.72C5.29,8.73 5,9.86 5,11V17L3,19V20H18.11L20.84,22.73L22.11,21.46M7,18V11C7,10.39 7.11,9.79 7.34,9.23L16.11,18H7M10,21H14A2,2 0 0,1 12,23A2,2 0 0,1 10,21M8.29,5.09C8.82,4.75 9.4,4.5 10,4.29C10,4.19 10,4.1 10,4A2,2 0 0,1 12,2A2,2 0 0,1 14,4C14,4.1 14,4.19 14,4.29C16.97,5.17 19,7.9 19,11V15.8L17,13.8V11A5,5 0 0,0 12,6C11.22,6 10.45,6.2 9.76,6.56L8.29,5.09Z" />
+</vector>
diff --git a/res/drawable/ic_start_24dp.xml b/res/drawable/ic_start_24dp.xml
index cb5afbc..96e0449 100644
--- a/res/drawable/ic_start_24dp.xml
+++ b/res/drawable/ic_start_24dp.xml
@@ -1,3 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_start_white_24dp" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="@android:color/black"
+ android:pathData="M8.5,8.64L13.77,12L8.5,15.36V8.64M6.5,5V19L17.5,12" />
+</vector>
diff --git a/res/drawable/ic_stop_24dp.xml b/res/drawable/ic_stop_24dp.xml
index 02a2cf1..4d9c9d4 100644
--- a/res/drawable/ic_stop_24dp.xml
+++ b/res/drawable/ic_stop_24dp.xml
@@ -1,3 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_stop_white_24dp" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="@android:color/black"
+ android:pathData="M16,8v8H8V8h8m2-2H6v12h12V6z" />
+</vector>
diff --git a/res/layout/alarm_volume_preference.xml b/res/layout/alarm_volume_preference.xml
index 109c7be..e8e969f 100644
--- a/res/layout/alarm_volume_preference.xml
+++ b/res/layout/alarm_volume_preference.xml
@@ -18,44 +18,66 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="?attr/selectableItemBackground"
- android:clipToPadding="false"
- android:focusable="true"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:gravity="center_vertical"
- android:minHeight="?attr/listPreferredItemHeightSmall"
- android:orientation="vertical"
- android:paddingBottom="16dp"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingTop="16dp">
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:clickable="false"
+ android:orientation="horizontal">
- <TextView
- android:id="@android:id/title"
+ <LinearLayout
+ android:id="@+id/icon_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:ellipsize="marquee"
- android:singleLine="true"
- android:textAppearance="?android:attr/textAppearanceListItem" />
+ android:minWidth="44dp"
+ android:gravity="start|center_vertical"
+ android:orientation="horizontal"
+ android:paddingEnd="12dp"
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp">
+ <androidx.preference.internal.PreferenceImageView
+ android:id="@android:id/icon"
+ android:layout_width="24dp"
+ android:layout_height="24dp"/>
+ </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/touch_target_min_size">
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginTop="8dp"
+ android:layout_marginBottom="8dp">
- <ImageView
- android:id="@+id/alarm_icon"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:importantForAccessibility="no" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:paddingStart="12dp"
+ android:singleLine="true"
+ android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
+ android:textColor="?android:attr/textColorPrimary"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal"/>
+ </LinearLayout>
- <!-- Specify maxHeight to properly set the track height on API < 23 -->
- <SeekBar
- android:id="@+id/alarm_volume_slider"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_gravity="center_vertical"
- android:layout_weight="1"
- android:maxHeight="@dimen/touch_target_min_size" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <SeekBar
+ android:id="@+id/seekbar"
+ android:layout_gravity="center_vertical"
+ android:paddingStart="12dp"
+ android:layout_width="match_parent"
+ android:layout_height="48dp"/>
+
+ </LinearLayout>
</LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/clock_fragment.xml b/res/layout/clock_fragment.xml
index ec97381..d1b7619 100644
--- a/res/layout/clock_fragment.xml
+++ b/res/layout/clock_fragment.xml
@@ -18,9 +18,8 @@
<androidx.recyclerview.widget.RecyclerView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/cities"
- android:layout_width="0dp"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_weight="1"
android:clickable="false"
android:clipToPadding="false"
android:paddingBottom="@dimen/fab_height"
diff --git a/res/layout/desk_clock.xml b/res/layout/desk_clock.xml
index d25e4f6..e39d1bb 100644
--- a/res/layout/desk_clock.xml
+++ b/res/layout/desk_clock.xml
@@ -15,15 +15,15 @@
limitations under the License.
-->
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:fitsSystemWindows="true"
- app:statusBarBackground="@null">
+ android:orientation="vertical"
+ app:statusBarBackground="@null"
+ android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
@@ -36,96 +36,94 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:contentInsetStart="0dp"
- tools:ignore="RtlSymmetry">
+ tools:ignore="RtlSymmetry"
+ android:gravity="center">
- <com.google.android.material.tabs.TabLayout
- android:id="@+id/tabs"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- app:tabGravity="fill"
- app:tabIndicatorColor="@android:color/transparent"
- app:tabMaxWidth="0dp"
- app:tabMode="fixed"
- app:tabPaddingEnd="0dp"
- app:tabPaddingStart="0dp" />
+ <TextView
+ android:id="@+id/title_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title" />
</androidx.appcompat.widget.Toolbar>
-
- <View
- android:id="@+id/tab_hairline"
- android:layout_width="match_parent"
- android:layout_height="@dimen/hairline_height"
- android:layout_gravity="bottom"
- android:background="@color/hairline"
- android:importantForAccessibility="no" />
-
</com.google.android.material.appbar.AppBarLayout>
- <FrameLayout
+ <androidx.coordinatorlayout.widget.CoordinatorLayout
+ android:id="@+id/content"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- app:layout_behavior="@string/appbar_scrolling_view_behavior">
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <androidx.viewpager.widget.ViewPager
- android:id="@+id/desk_clock_pager"
+ <FrameLayout
+ android:id="@+id/fragment_container"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:importantForAccessibility="no"
- android:saveEnabled="false" />
+ android:layout_height="match_parent"/>
- <include layout="@layout/drop_shadow" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:baselineAligned="false"
+ android:orientation="horizontal"
+ app:layout_behavior="com.android.deskclock.widget.toast.SnackbarSlidingBehavior">
- </FrameLayout>
+ <FrameLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_gravity="start|center_vertical"
+ android:layout_weight="1">
- <LinearLayout
+ <Button
+ android:id="@+id/left_button"
+ style="?attr/borderlessButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:scaleType="centerInside" />
+
+ </FrameLayout>
+
+ <com.google.android.material.floatingactionbutton.FloatingActionButton
+ android:id="@+id/fab"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_margin="@dimen/fab_margin"
+ app:borderWidth="0dp"
+ app:elevation="@dimen/fab_elevation" />
+
+ <FrameLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_gravity="end|center_vertical"
+ android:layout_weight="1">
+
+ <Button
+ android:id="@+id/right_button"
+ style="?attr/borderlessButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:scaleType="centerInside" />
+
+ </FrameLayout>
+
+ </LinearLayout>
+
+ </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+ <com.google.android.material.bottomnavigation.BottomNavigationView
+ android:id="@+id/bottom_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:baselineAligned="false"
- android:orientation="horizontal"
- app:layout_behavior="com.android.deskclock.widget.toast.SnackbarSlidingBehavior">
+ android:layout_below="@id/content"
+ android:background="@color/secondary_color"
+ app:menu="@menu/bottom_navigation_menu"
+ app:itemIconTint="@color/tab_tint_color"
+ app:itemTextColor="@color/tab_tint_color"
+ app:itemTextAppearanceActive="@style/navText"
+ app:itemTextAppearanceInactive="@style/navText"
+ app:labelVisibilityMode="labeled" />
- <FrameLayout
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_gravity="start|center_vertical"
- android:layout_weight="1">
-
- <Button
- android:id="@+id/left_button"
- style="?attr/borderlessButtonStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:scaleType="centerInside" />
-
- </FrameLayout>
-
- <com.google.android.material.floatingactionbutton.FloatingActionButton
- android:id="@+id/fab"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_margin="@dimen/fab_margin"
- app:borderWidth="0dp"
- app:elevation="@dimen/fab_elevation" />
-
- <FrameLayout
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_gravity="end|center_vertical"
- android:layout_weight="1">
-
- <Button
- android:id="@+id/right_button"
- style="?attr/borderlessButtonStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:scaleType="centerInside" />
-
- </FrameLayout>
-
- </LinearLayout>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
diff --git a/res/layout/tab_item.xml b/res/layout/tab_item.xml
deleted file mode 100644
index 4d8b17c..0000000
--- a/res/layout/tab_item.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-
-<TextView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@android:id/text1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:drawablePadding="10dp"
- android:gravity="center"
- android:includeFontPadding="false"
- android:singleLine="true"
- android:textAppearance="@style/TextAppearance.Tab" />
diff --git a/res/layout/timer_setup_time.xml b/res/layout/timer_setup_time.xml
index 947723c..572063f 100644
--- a/res/layout/timer_setup_time.xml
+++ b/res/layout/timer_setup_time.xml
@@ -19,9 +19,11 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_gravity="center"
android:gravity="center"
+ android:minHeight="@dimen/timer_setup_top_size"
android:layoutDirection="ltr"
android:orientation="horizontal">
@@ -42,7 +44,6 @@
android:id="@+id/timer_setup_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/timer_setup_delete_margin"
android:contentDescription="@string/timer_delete"
android:padding="12dp"
android:scaleType="center"
diff --git a/res/layout/timer_setup_view.xml b/res/layout/timer_setup_view.xml
index ec99b42..526862f 100644
--- a/res/layout/timer_setup_view.xml
+++ b/res/layout/timer_setup_view.xml
@@ -21,8 +21,7 @@
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"
- android:paddingBottom="@dimen/fab_height"
- android:paddingTop="@dimen/timer_setup_top_margin">
+ android:paddingBottom="@dimen/fab_height">
<include layout="@layout/timer_setup_time" />
diff --git a/res/menu/bottom_navigation_menu.xml b/res/menu/bottom_navigation_menu.xml
new file mode 100644
index 0000000..1ad8469
--- /dev/null
+++ b/res/menu/bottom_navigation_menu.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:id="@+id/page_alarm"
+ android:enabled="true"
+ android:icon="@drawable/ic_tab_alarm"
+ android:title="@string/menu_alarm"/>
+ <item
+ android:id="@+id/page_clock"
+ android:enabled="true"
+ android:icon="@drawable/ic_tab_clock"
+ android:title="@string/menu_clock"/>
+ <item
+ android:id="@+id/page_timer"
+ android:enabled="true"
+ android:icon="@drawable/ic_tab_timer"
+ android:title="@string/menu_timer"/>
+ <item
+ android:id="@+id/page_stopwatch"
+ android:enabled="true"
+ android:icon="@drawable/ic_tab_stopwatch"
+ android:title="@string/menu_stopwatch"/>
+</menu>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 1926bc7..7ce663a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Vandag"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Maak toe"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Wekker gemis"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Gesluimer"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min.</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Afteller gemis: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Laat wag"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Stel alle aftellers terug"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 36b7cc8..df55c24 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ደቂቃ</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ያመለጠ ሰዓት ቆጣሪ፦ <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"ለአፍታ አቁም"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"ሁሉንም ሰዓት ቆጣሪዎች ዳግም አስጀምር"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
new file mode 100644
index 0000000..fddfdb6
--- /dev/null
+++ b/res/values-ar/cm_strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">تأثير قلب الجهاز</string>
+ <string name="shake_action_title">تأثير هز الجهاز</string>
+ <string-array name="action_setting_entries">
+ <item>غفوة</item>
+ <item>تجاهل</item>
+ <item>لا شيء</item>
+ </string-array>
+</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index f9eaf8a..0cfceb8 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="zero"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -275,8 +275,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"الموقِّت الفائت: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"إيقاف مؤقت"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"إعادة ضبط الموقتات"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index c6335b7..7887933 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> মিনিট</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"সজাগ হ\'ব নোৱাৰা টাইমাৰ: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"পজ কৰক"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"সকলো টাইমাৰ ৰিছেট কৰক"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-ast-rES/cities.xml b/res/values-ast-rES/cities.xml
new file mode 100644
index 0000000..ee4236a
--- /dev/null
+++ b/res/values-ast-rES/cities.xml
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 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
+ -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools" tools:ignore="Typos">
+ <string name="C1">A<xliff:g id="separator">=</xliff:g>Abidjan<xliff:g id="timezone">|Africa/Abidjan</xliff:g></string>
+ <string name="C2">A<xliff:g id="separator">=</xliff:g>Accra<xliff:g id="timezone">|Africa/Accra</xliff:g></string>
+ <string name="C3">A<xliff:g id="separator">=</xliff:g>Addis Ababa<xliff:g id="timezone">|Africa/Addis_Ababa</xliff:g></string>
+ <string name="C4">A<xliff:g id="separator">=</xliff:g>Algiers<xliff:g id="timezone">|Africa/Algiers</xliff:g></string>
+ <string name="C5">B<xliff:g id="separator">=</xliff:g>Blantyre<xliff:g id="timezone">|Africa/Blantyre</xliff:g></string>
+ <string name="C6">B<xliff:g id="separator">=</xliff:g>Brazzaville<xliff:g id="timezone">|Africa/Brazzaville</xliff:g></string>
+ <string name="C7">C<xliff:g id="separator">=</xliff:g>Cairo<xliff:g id="timezone">|Africa/Cairo</xliff:g></string>
+ <string name="C8">C<xliff:g id="separator">=</xliff:g>Casablanca<xliff:g id="timezone">|Africa/Casablanca</xliff:g></string>
+ <string name="C9">C<xliff:g id="separator">=</xliff:g>Conakry<xliff:g id="timezone">|Africa/Conakry</xliff:g></string>
+ <string name="C10">D<xliff:g id="separator">=</xliff:g>Dakar<xliff:g id="timezone">|Africa/Dakar</xliff:g></string>
+ <string name="C11">D<xliff:g id="separator">=</xliff:g>Dar es Salaam<xliff:g id="timezone">|Africa/Dar_es_Salaam</xliff:g></string>
+ <string name="C12">D<xliff:g id="separator">=</xliff:g>Djibouti<xliff:g id="timezone">|Africa/Djibouti</xliff:g></string>
+ <string name="C13">F<xliff:g id="separator">=</xliff:g>Freetown<xliff:g id="timezone">|Africa/Freetown</xliff:g></string>
+ <string name="C14">G<xliff:g id="separator">=</xliff:g>Gaborone<xliff:g id="timezone">|Africa/Gaborone</xliff:g></string>
+ <string name="C15">H<xliff:g id="separator">=</xliff:g>Harare<xliff:g id="timezone">|Africa/Harare</xliff:g></string>
+ <string name="C16">J<xliff:g id="separator">=</xliff:g>Johannesburg<xliff:g id="timezone">|Africa/Johannesburg</xliff:g></string>
+ <string name="C17">K<xliff:g id="separator">=</xliff:g>Kampala<xliff:g id="timezone">|Africa/Kampala</xliff:g></string>
+ <string name="C18">K<xliff:g id="separator">=</xliff:g>Khartoum<xliff:g id="timezone">|Africa/Khartoum</xliff:g></string>
+ <string name="C19">K<xliff:g id="separator">=</xliff:g>Kigali<xliff:g id="timezone">|Africa/Kigali</xliff:g></string>
+ <string name="C20">K<xliff:g id="separator">=</xliff:g>Kinshasa<xliff:g id="timezone">|Africa/Kinshasa</xliff:g></string>
+ <string name="C21">L<xliff:g id="separator">=</xliff:g>Lagos<xliff:g id="timezone">|Africa/Lagos</xliff:g></string>
+ <string name="C22">M<xliff:g id="separator">=</xliff:g>Maseru<xliff:g id="timezone">|Africa/Maseru</xliff:g></string>
+ <string name="C23">M<xliff:g id="separator">=</xliff:g>Mogadishu<xliff:g id="timezone">|Africa/Mogadishu</xliff:g></string>
+ <string name="C24">N<xliff:g id="separator">=</xliff:g>Nairobi<xliff:g id="timezone">|Africa/Nairobi</xliff:g></string>
+ <string name="C25">S<xliff:g id="separator">=</xliff:g>São Tomé<xliff:g id="timezone">|Africa/Sao_Tome</xliff:g></string>
+ <string name="C26">T<xliff:g id="separator">=</xliff:g>Timbuktu<xliff:g id="timezone">|Africa/Timbuktu</xliff:g></string>
+ <string name="C27">T<xliff:g id="separator">=</xliff:g>Tripoli<xliff:g id="timezone">|Africa/Tripoli</xliff:g></string>
+ <string name="C28">T<xliff:g id="separator">=</xliff:g>Tunis<xliff:g id="timezone">|Africa/Tunis</xliff:g></string>
+ <string name="C29">A<xliff:g id="separator">=</xliff:g>Anchorage<xliff:g id="timezone">|America/Anchorage</xliff:g></string>
+ <string name="C31">A<xliff:g id="separator">=</xliff:g>Aruba<xliff:g id="timezone">|America/Aruba</xliff:g></string>
+ <string name="C32">A<xliff:g id="separator">=</xliff:g>Asunción<xliff:g id="timezone">|America/Asuncion</xliff:g></string>
+ <string name="C33">B<xliff:g id="separator">=</xliff:g>Barbados<xliff:g id="timezone">|America/Barbados</xliff:g></string>
+ <string name="C34">B<xliff:g id="separator">=</xliff:g>Belize<xliff:g id="timezone">|America/Belize</xliff:g></string>
+ <string name="C35">B<xliff:g id="separator">=</xliff:g>Bogotá<xliff:g id="timezone">|America/Bogota</xliff:g></string>
+ <string name="C36">B<xliff:g id="separator">=</xliff:g>Buenos Aires<xliff:g id="timezone">|America/Buenos_Aires</xliff:g></string>
+ <string name="C37">C<xliff:g id="separator">=</xliff:g>Cancun<xliff:g id="timezone">|America/Cancun</xliff:g></string>
+ <string name="C38">C<xliff:g id="separator">=</xliff:g>Caracas<xliff:g id="timezone">|America/Caracas</xliff:g></string>
+ <string name="C39">C<xliff:g id="separator">=</xliff:g>Cayman<xliff:g id="timezone">|America/Cayman</xliff:g></string>
+ <string name="C40">C<xliff:g id="separator">=</xliff:g>Chicago<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C42">C<xliff:g id="separator">=</xliff:g>Curaçao<xliff:g id="timezone">|America/Curacao</xliff:g></string>
+ <string name="C43">D<xliff:g id="separator">=</xliff:g>Dawson Creek<xliff:g id="timezone">|America/Dawson_Creek</xliff:g></string>
+ <string name="C44">D<xliff:g id="separator">=</xliff:g>Denver<xliff:g id="timezone">|America/Denver</xliff:g></string>
+ <string name="C45">D<xliff:g id="separator">=</xliff:g>Detroit<xliff:g id="timezone">|America/Detroit</xliff:g></string>
+ <string name="C46">D<xliff:g id="separator">=</xliff:g>Dominica<xliff:g id="timezone">|America/Dominica</xliff:g></string>
+ <string name="C47">E<xliff:g id="separator">=</xliff:g>Edmonton<xliff:g id="timezone">|America/Edmonton</xliff:g></string>
+ <string name="C48">E<xliff:g id="separator">=</xliff:g>El Salvador<xliff:g id="timezone">|America/El_Salvador</xliff:g></string>
+ <string name="C49">F<xliff:g id="separator">=</xliff:g>Fortaleza<xliff:g id="timezone">|America/Fortaleza</xliff:g></string>
+ <string name="C50">G<xliff:g id="separator">=</xliff:g>Grand Turk<xliff:g id="timezone">|America/Grand_Turk</xliff:g></string>
+ <string name="C51">G<xliff:g id="separator">=</xliff:g>Grenada<xliff:g id="timezone">|America/Grenada</xliff:g></string>
+ <string name="C52">G<xliff:g id="separator">=</xliff:g>Guatemala City<xliff:g id="timezone">|America/Guatemala</xliff:g></string>
+ <string name="C53">G<xliff:g id="separator">=</xliff:g>Guyana<xliff:g id="timezone">|America/Guyana</xliff:g></string>
+ <string name="C54">H<xliff:g id="separator">=</xliff:g>Halifax<xliff:g id="timezone">|America/Halifax</xliff:g></string>
+ <string name="C55">H<xliff:g id="separator">=</xliff:g>Habana L\'<xliff:g id="timezone">|America/Habana L\'</xliff:g></string>
+ <string name="C56">I<xliff:g id="separator">=</xliff:g>Indianapolis<xliff:g id="timezone">|America/Indiana/Indianapolis</xliff:g></string>
+ <string name="C57">K<xliff:g id="separator">=</xliff:g>Knox<xliff:g id="timezone">|America/Indiana/Knox</xliff:g></string>
+ <string name="C58">M<xliff:g id="separator">=</xliff:g>Marengo<xliff:g id="timezone">|America/Indiana/Marengo</xliff:g></string>
+ <string name="C59">P<xliff:g id="separator">=</xliff:g>Petersburg<xliff:g id="timezone">|America/Indiana/Petersburg</xliff:g></string>
+ <string name="C60">T<xliff:g id="separator">=</xliff:g>Tell City<xliff:g id="timezone">|America/Indiana/Tell_City</xliff:g></string>
+ <string name="C61">V<xliff:g id="separator">=</xliff:g>Vevay<xliff:g id="timezone">|America/Indiana/Vevay</xliff:g></string>
+ <string name="C62">V<xliff:g id="separator">=</xliff:g>Vincennes<xliff:g id="timezone">|America/Indiana/Vincennes</xliff:g></string>
+ <string name="C63">W<xliff:g id="separator">=</xliff:g>Winamac<xliff:g id="timezone">|America/Indiana/Winamac</xliff:g></string>
+ <string name="C64">K<xliff:g id="separator">=</xliff:g>Kingston<xliff:g id="timezone">|America/Jamaica</xliff:g></string>
+ <string name="C65">N<xliff:g id="separator">=</xliff:g>Nuestra Señora de La Paz<xliff:g id="timezone">|America/La_Paz</xliff:g></string>
+ <string name="C66">L<xliff:g id="separator">=</xliff:g>Lima<xliff:g id="timezone">|America/Lima</xliff:g></string>
+ <string name="C67">L<xliff:g id="separator">=</xliff:g>Los Angeles<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C68">L<xliff:g id="separator">=</xliff:g>Louisville<xliff:g id="timezone">|America/Louisville</xliff:g></string>
+ <string name="C69">M<xliff:g id="separator">=</xliff:g>Managua<xliff:g id="timezone">|America/Managua</xliff:g></string>
+ <string name="C70">M<xliff:g id="separator">=</xliff:g>Martinique<xliff:g id="timezone">|America/Martinique</xliff:g></string>
+ <string name="C71">M<xliff:g id="separator">=</xliff:g>Mendoza<xliff:g id="timezone">|America/Mendoza</xliff:g></string>
+ <string name="C72">M<xliff:g id="separator">=</xliff:g>Metlakatla<xliff:g id="timezone">|America/Metlakatla</xliff:g></string>
+ <string name="C73">M<xliff:g id="separator">=</xliff:g>Mexico City<xliff:g id="timezone">|America/Mexico_City</xliff:g></string>
+ <string name="C74">M<xliff:g id="separator">=</xliff:g>Monterrey<xliff:g id="timezone">|America/Monterrey</xliff:g></string>
+ <string name="C75">M<xliff:g id="separator">=</xliff:g>Montevideo<xliff:g id="timezone">|America/Montevideo</xliff:g></string>
+ <string name="C76">M<xliff:g id="separator">=</xliff:g>Montreal<xliff:g id="timezone">|America/Montreal</xliff:g></string>
+ <string name="C77">N<xliff:g id="separator">=</xliff:g>Nassau<xliff:g id="timezone">|America/Nassau</xliff:g></string>
+ <string name="C78">N<xliff:g id="separator">=</xliff:g>New York<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C79">B<xliff:g id="separator">=</xliff:g>Beulah<xliff:g id="timezone">|America/North_Dakota/Beulah</xliff:g></string>
+ <string name="C80">C<xliff:g id="separator">=</xliff:g>Center<xliff:g id="timezone">|America/North_Dakota/Center</xliff:g></string>
+ <string name="C81">N<xliff:g id="separator">=</xliff:g>New Salem<xliff:g id="timezone">|America/North_Dakota/New_Salem</xliff:g></string>
+ <string name="C82">P<xliff:g id="separator">=</xliff:g>Panama<xliff:g id="timezone">|America/Panama</xliff:g></string>
+ <string name="C83">P<xliff:g id="separator">=</xliff:g>Phoenix<xliff:g id="timezone">|America/Phoenix</xliff:g></string>
+ <string name="C84">P<xliff:g id="separator">=</xliff:g>Port of Spain<xliff:g id="timezone">|America/Port_of_Spain</xliff:g></string>
+ <string name="C85">P<xliff:g id="separator">=</xliff:g>Port-au-Prince<xliff:g id="timezone">|America/Port-au-Prince</xliff:g></string>
+ <string name="C86">P<xliff:g id="separator">=</xliff:g>Puerto Rico<xliff:g id="timezone">|America/Puerto_Rico</xliff:g></string>
+ <string name="C87">S<xliff:g id="separator">=</xliff:g>Santo Domingo<xliff:g id="timezone">|America/Santo_Domingo</xliff:g></string>
+ <string name="C88">S<xliff:g id="separator">=</xliff:g>São Paulo<xliff:g id="timezone">|America/Sao_Paulo</xliff:g></string>
+ <string name="C89">S<xliff:g id="separator">=</xliff:g>St. Johns<xliff:g id="timezone">|America/St_Johns</xliff:g></string>
+ <string name="C90">S<xliff:g id="separator">=</xliff:g>St. Kitts<xliff:g id="timezone">|America/St_Kitts</xliff:g></string>
+ <string name="C91">S<xliff:g id="separator">=</xliff:g>St. Lucia<xliff:g id="timezone">|America/St_Lucia</xliff:g></string>
+ <string name="C92">S<xliff:g id="separator">=</xliff:g>St. Thomas<xliff:g id="timezone">|America/St_Thomas</xliff:g></string>
+ <string name="C93">T<xliff:g id="separator">=</xliff:g>Tijuana<xliff:g id="timezone">|America/Tijuana</xliff:g></string>
+ <string name="C94">T<xliff:g id="separator">=</xliff:g>Toronto<xliff:g id="timezone">|America/Toronto</xliff:g></string>
+ <string name="C95">V<xliff:g id="separator">=</xliff:g>Vancouver<xliff:g id="timezone">|America/Vancouver</xliff:g></string>
+ <string name="C96">W<xliff:g id="separator">=</xliff:g>Winnipeg<xliff:g id="timezone">|America/Winnipeg</xliff:g></string>
+ <string name="C97">S<xliff:g id="separator">=</xliff:g>South Pole<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Antarctica/South_Pole</xliff:g></string>
+ <string name="C98">L<xliff:g id="separator">=</xliff:g>Longyearbyen<xliff:g id="timezone">|Arctic/Longyearbyen</xliff:g></string>
+ <string name="C99">A<xliff:g id="separator">=</xliff:g>Almaty<xliff:g id="timezone">|Asia/Almaty</xliff:g></string>
+ <string name="C100">A<xliff:g id="separator">=</xliff:g>Amman<xliff:g id="timezone">|Asia/Amman</xliff:g></string>
+ <string name="C101">A<xliff:g id="separator">=</xliff:g>Anadyr<xliff:g id="timezone">|Asia/Anadyr</xliff:g></string>
+ <string name="C102">A<xliff:g id="separator">=</xliff:g>Aqtau<xliff:g id="timezone">|Asia/Aqtau</xliff:g></string>
+ <string name="C103">B<xliff:g id="separator">=</xliff:g>Baghdad<xliff:g id="timezone">|Asia/Baghdad</xliff:g></string>
+ <string name="C104">B<xliff:g id="separator">=</xliff:g>Bahrain<xliff:g id="timezone">|Asia/Bahrain</xliff:g></string>
+ <string name="C105">B<xliff:g id="separator">=</xliff:g>Baku<xliff:g id="timezone">|Asia/Baku</xliff:g></string>
+ <string name="C106">B<xliff:g id="separator">=</xliff:g>Bangkok<xliff:g id="timezone">|Asia/Bangkok</xliff:g></string>
+ <string name="C107">B<xliff:g id="separator">=</xliff:g>Beirut<xliff:g id="timezone">|Asia/Beirut</xliff:g></string>
+ <string name="C108">K<xliff:g id="separator">=</xliff:g>Kolkata<xliff:g id="timezone">|Asia/Calcutta</xliff:g></string>
+ <string name="C109">D<xliff:g id="separator">=</xliff:g>Damascu<xliff:g id="timezone">|Asia/Damascu</xliff:g></string>
+ <string name="C110">D<xliff:g id="separator">=</xliff:g>Dhaka<xliff:g id="timezone">|Asia/Dhaka</xliff:g></string>
+ <string name="C111">D<xliff:g id="separator">=</xliff:g>Dubai<xliff:g id="timezone">|Asia/Dubai</xliff:g></string>
+ <string name="C112">G<xliff:g id="separator">=</xliff:g>Gaza<xliff:g id="timezone">|Asia/Gaza</xliff:g></string>
+ <string name="C113">H<xliff:g id="separator">=</xliff:g>Hebron<xliff:g id="timezone">|Asia/Hebron</xliff:g></string>
+ <string name="C114">H<xliff:g id="separator">=</xliff:g>Ho Chi Minh<xliff:g id="timezone">|Asia/Ho_Chi_Minh</xliff:g></string>
+ <string name="C115">H<xliff:g id="separator">=</xliff:g>Hong Kong<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Asia/Hong_Kong</xliff:g></string>
+ <string name="C117">J<xliff:g id="separator">=</xliff:g>Jakarta<xliff:g id="timezone">|Asia/Jakarta</xliff:g></string>
+ <string name="C118">J<xliff:g id="separator">=</xliff:g>Jerusalem<xliff:g id="timezone">|Asia/Jerusalem</xliff:g></string>
+ <string name="C119">K<xliff:g id="separator">=</xliff:g>Kabul<xliff:g id="timezone">|Asia/Kabul</xliff:g></string>
+ <string name="C120">K<xliff:g id="separator">=</xliff:g>Karachi<xliff:g id="timezone">|Asia/Karachi</xliff:g></string>
+ <string name="C121">K<xliff:g id="separator">=</xliff:g>Kathmandu<xliff:g id="timezone">|Asia/Kathmandu</xliff:g></string>
+ <string name="C122">K<xliff:g id="separator">=</xliff:g>Kuala Lumpur<xliff:g id="timezone">|Asia/Kuala_Lumpur</xliff:g></string>
+ <string name="C123">K<xliff:g id="separator">=</xliff:g>Kuwait<xliff:g id="timezone">|Asia/Kuwait</xliff:g></string>
+ <string name="C124">M<xliff:g id="separator">=</xliff:g>Macau<xliff:g id="timezone">|Asia/Macau</xliff:g></string>
+ <string name="C125">M<xliff:g id="separator">=</xliff:g>Manila<xliff:g id="timezone">|Asia/Manila</xliff:g></string>
+ <string name="C126">M<xliff:g id="separator">=</xliff:g>Muscat<xliff:g id="timezone">|Asia/Muscat</xliff:g></string>
+ <string name="C127">P<xliff:g id="separator">=</xliff:g>Phnom Penh<xliff:g id="timezone">|Asia/Phnom_Penh</xliff:g></string>
+ <string name="C128">P<xliff:g id="separator">=</xliff:g>Pyongyang<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Asia/Pyongyang</xliff:g></string>
+ <string name="C130">R<xliff:g id="separator">=</xliff:g>Rangoon<xliff:g id="timezone">|Asia/Rangoon</xliff:g></string>
+ <string name="C131">R<xliff:g id="separator">=</xliff:g>Riyadh<xliff:g id="timezone">|Asia/Riyadh</xliff:g></string>
+ <string name="C133">S<xliff:g id="separator">=</xliff:g>Seoul<xliff:g id="timezone">|Asia/Seoul</xliff:g></string>
+ <string name="C134">S<xliff:g id="separator">=</xliff:g>Shanghai<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Asia/Shanghai</xliff:g></string>
+ <string name="C135">S<xliff:g id="separator">=</xliff:g>Singapore<xliff:g id="timezone">|Asia/Singapore</xliff:g></string>
+ <string name="C136">T<xliff:g id="separator">=</xliff:g>Taipei<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Asia/Taipei</xliff:g></string>
+ <string name="C137">T<xliff:g id="separator">=</xliff:g>Tehran<xliff:g id="timezone">|Asia/Tehran</xliff:g></string>
+ <string name="C138">T<xliff:g id="separator">=</xliff:g>Tel Aviv<xliff:g id="timezone">|Asia/Tel_Aviv</xliff:g></string>
+ <string name="C139">T<xliff:g id="separator">=</xliff:g>Tokyo<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Asia/Tokyo</xliff:g></string>
+ <string name="C140">U<xliff:g id="separator">=</xliff:g>Ulaanbaatar<xliff:g id="timezone">|Asia/Ulaanbaatar</xliff:g></string>
+ <string name="C141">B<xliff:g id="separator">=</xliff:g>Bermuda<xliff:g id="timezone">|Atlantic/Bermuda</xliff:g></string>
+ <string name="C142">C<xliff:g id="separator">=</xliff:g>Canaries<xliff:g id="timezone">|Atlantic/Canaries</xliff:g></string>
+ <string name="C143">C<xliff:g id="separator">=</xliff:g>Cape Verde<xliff:g id="timezone">|Atlantic/Cabu_Verde</xliff:g></string>
+ <string name="C144">R<xliff:g id="separator">=</xliff:g>Reykjavik<xliff:g id="timezone">|Atlantic/Reykjavik</xliff:g></string>
+ <string name="C145">S<xliff:g id="separator">=</xliff:g>Stanley<xliff:g id="timezone">|Atlantic/Stanley</xliff:g></string>
+ <string name="C146">A<xliff:g id="separator">=</xliff:g>Adelaide<xliff:g id="timezone">|Australia/Adelaide</xliff:g></string>
+ <string name="C147">B<xliff:g id="separator">=</xliff:g>Brisbane<xliff:g id="timezone">|Australia/Brisbane</xliff:g></string>
+ <string name="C148">C<xliff:g id="separator">=</xliff:g>Canberra<xliff:g id="timezone">|Australia/Canberra</xliff:g></string>
+ <string name="C149">D<xliff:g id="separator">=</xliff:g>Darwin<xliff:g id="timezone">|Australia/Darwin</xliff:g></string>
+ <string name="C150">M<xliff:g id="separator">=</xliff:g>Melbourne<xliff:g id="timezone">|Australia/Melbourne</xliff:g></string>
+ <string name="C151">N<xliff:g id="separator">=</xliff:g>New South Wales<xliff:g id="timezone">|Australia/NSW</xliff:g></string>
+ <string name="C152">P<xliff:g id="separator">=</xliff:g>Perth<xliff:g id="timezone">|Australia/Perth</xliff:g></string>
+ <string name="C153">Q<xliff:g id="separator">=</xliff:g>Queensland<xliff:g id="timezone">|Australia/Queensland</xliff:g></string>
+ <string name="C154">S<xliff:g id="separator">=</xliff:g>Sydney<xliff:g id="timezone">|Australia/Sydney</xliff:g></string>
+ <string name="C155">V<xliff:g id="separator">=</xliff:g>Victoria<xliff:g id="timezone">|Australia/Victoria</xliff:g></string>
+ <string name="C156">N<xliff:g id="separator">=</xliff:g>Newfoundland<xliff:g id="timezone">|Canada/Newfoundland</xliff:g></string>
+ <string name="C157">S<xliff:g id="separator">=</xliff:g>Saskatchewan<xliff:g id="timezone">|Canada/Saskatchewan</xliff:g></string>
+ <string name="C158">E<xliff:g id="separator">=</xliff:g>Easter Island<xliff:g id="timezone">|Chile/EasterIsland</xliff:g></string>
+ <string name="C159">A<xliff:g id="separator">=</xliff:g>Amsterdam<xliff:g id="timezone">|Europe/Amsterdam</xliff:g></string>
+ <string name="C160">A<xliff:g id="separator">=</xliff:g>Andorra<xliff:g id="timezone">|Europe/Andorra</xliff:g></string>
+ <string name="C161">A<xliff:g id="separator">=</xliff:g>Athens<xliff:g id="timezone">|Europe/Athens</xliff:g></string>
+ <string name="C162">B<xliff:g id="separator">=</xliff:g>Belfast<xliff:g id="timezone">|Europe/Belfast</xliff:g></string>
+ <string name="C163">B<xliff:g id="separator">=</xliff:g>Belgrade<xliff:g id="timezone">|Europe/Belgrade</xliff:g></string>
+ <string name="C164">B<xliff:g id="separator">=</xliff:g>Berlin<xliff:g id="timezone">|Europe/Berlin</xliff:g></string>
+ <string name="C165">B<xliff:g id="separator">=</xliff:g>Bratislava<xliff:g id="timezone">|Europe/Bratislava</xliff:g></string>
+ <string name="C166">B<xliff:g id="separator">=</xliff:g>Brussels<xliff:g id="timezone">|Europe/Brussels</xliff:g></string>
+ <string name="C167">B<xliff:g id="separator">=</xliff:g>Bucharest<xliff:g id="timezone">|Europe/Bucharest</xliff:g></string>
+ <string name="C168">B<xliff:g id="separator">=</xliff:g>Budapest<xliff:g id="timezone">|Europe/Budapest</xliff:g></string>
+ <string name="C169">C<xliff:g id="separator">=</xliff:g>Chisinau<xliff:g id="timezone">|Europe/Chisinau</xliff:g></string>
+ <string name="C170">C<xliff:g id="separator">=</xliff:g>Copenhagen<xliff:g id="timezone">|Europe/Copenhagen</xliff:g></string>
+ <string name="C171">D<xliff:g id="separator">=</xliff:g>Dublin<xliff:g id="timezone">|Europe/Dublin</xliff:g></string>
+ <string name="C172">G<xliff:g id="separator">=</xliff:g>Gibraltar<xliff:g id="timezone">|Europe/Gibraltar</xliff:g></string>
+ <string name="C173">H<xliff:g id="separator">=</xliff:g>Helsinki<xliff:g id="timezone">|Europe/Helsinki</xliff:g></string>
+ <string name="C174">I<xliff:g id="separator">=</xliff:g>Islla de Man<xliff:g id="timezone">|Europe/Islla_de_Man</xliff:g></string>
+ <string name="C175">I<xliff:g id="separator">=</xliff:g>Istanbul<xliff:g id="timezone">|Europe/Istanbul</xliff:g></string>
+ <string name="C176">K<xliff:g id="separator">=</xliff:g>Kiev<xliff:g id="timezone">|Europe/Kiev</xliff:g></string>
+ <string name="C177">L<xliff:g id="separator">=</xliff:g>Lisboa<xliff:g id="timezone">|Europe/Lisboa</xliff:g></string>
+ <string name="C178">L<xliff:g id="separator">=</xliff:g>London<xliff:g id="timezone">|Europe/London</xliff:g></string>
+ <string name="C179">L<xliff:g id="separator">=</xliff:g>Luxembourg<xliff:g id="timezone">|Europe/Luxembourg</xliff:g></string>
+ <string name="C180">M<xliff:g id="separator">=</xliff:g>Madrid<xliff:g id="timezone">|Europe/Madrid</xliff:g></string>
+ <string name="C181">M<xliff:g id="separator">=</xliff:g>Malta<xliff:g id="timezone">|Europe/Malta</xliff:g></string>
+ <string name="C182">M<xliff:g id="separator">=</xliff:g>Minsk<xliff:g id="timezone">|Europe/Minsk</xliff:g></string>
+ <string name="C183">M<xliff:g id="separator">=</xliff:g>Mónaco<xliff:g id="timezone">|Europe/Mónaco</xliff:g></string>
+ <string name="C184">M<xliff:g id="separator">=</xliff:g>Moscu<xliff:g id="timezone">|Europe/Moscu</xliff:g></string>
+ <string name="C185">O<xliff:g id="separator">=</xliff:g>Oslo<xliff:g id="timezone">|Europe/Oslo</xliff:g></string>
+ <string name="C186">P<xliff:g id="separator">=</xliff:g>Paris<xliff:g id="timezone">|Europe/Paris</xliff:g></string>
+ <string name="C187">P<xliff:g id="separator">=</xliff:g>Prague<xliff:g id="timezone">|Europe/Prague</xliff:g></string>
+ <string name="C188">R<xliff:g id="separator">=</xliff:g>Riga<xliff:g id="timezone">|Europe/Riga</xliff:g></string>
+ <string name="C189">R<xliff:g id="separator">=</xliff:g>Rome<xliff:g id="timezone">|Europe/Roma</xliff:g></string>
+ <string name="C190">S<xliff:g id="separator">=</xliff:g>San Marino<xliff:g id="timezone">|Europe/San_Marino</xliff:g></string>
+ <string name="C191">S<xliff:g id="separator">=</xliff:g>Sarajevo<xliff:g id="timezone">|Europe/Sarajevo</xliff:g></string>
+ <string name="C192">S<xliff:g id="separator">=</xliff:g>Simferopol<xliff:g id="timezone">|Europe/Simferopol</xliff:g></string>
+ <string name="C193">S<xliff:g id="separator">=</xliff:g>Skopje<xliff:g id="timezone">|Europe/Skopje</xliff:g></string>
+ <string name="C194">S<xliff:g id="separator">=</xliff:g>Sofia<xliff:g id="timezone">|Europe/Sofía</xliff:g></string>
+ <string name="C195">S<xliff:g id="separator">=</xliff:g>Stockholm<xliff:g id="timezone">|Europe/Stockholm</xliff:g></string>
+ <string name="C196">T<xliff:g id="separator">=</xliff:g>Tallinn<xliff:g id="timezone">|Europe/Tallinn</xliff:g></string>
+ <string name="C197">V<xliff:g id="separator">=</xliff:g>Vatican<xliff:g id="timezone">|Europe/Vatican</xliff:g></string>
+ <string name="C198">V<xliff:g id="separator">=</xliff:g>Vienna<xliff:g id="timezone">|Europe/Vienna</xliff:g></string>
+ <string name="C199">V<xliff:g id="separator">=</xliff:g>Vilnius<xliff:g id="timezone">|Europe/Vilnius</xliff:g></string>
+ <string name="C200">W<xliff:g id="separator">=</xliff:g>Varsovia<xliff:g id="timezone">|Europe/Varsovia</xliff:g></string>
+ <string name="C201">Z<xliff:g id="separator">=</xliff:g>Zagreb<xliff:g id="timezone">|Europe/Zagreb</xliff:g></string>
+ <string name="C202">Z<xliff:g id="separator">=</xliff:g>Zurich<xliff:g id="timezone">|Europe/Zurich</xliff:g></string>
+ <string name="C203">A<xliff:g id="separator">=</xliff:g>Antananarivo<xliff:g id="timezone">|Indian/Antananarivo</xliff:g></string>
+ <string name="C204">M<xliff:g id="separator">=</xliff:g>Maldives<xliff:g id="timezone">|Indian/Maldives</xliff:g></string>
+ <string name="C205">M<xliff:g id="separator">=</xliff:g>Mauritius<xliff:g id="timezone">|Indian/Mauritius</xliff:g></string>
+ <string name="C206">A<xliff:g id="separator">=</xliff:g>Auckland<xliff:g id="timezone">|Pacific/Auckland</xliff:g></string>
+ <string name="C207">F<xliff:g id="separator">=</xliff:g>Fiji<xliff:g id="timezone">|Pacific/Fiji</xliff:g></string>
+ <string name="C208">G<xliff:g id="separator">=</xliff:g>Guam<xliff:g id="timezone">|Pacific/Guam</xliff:g></string>
+ <string name="C209">H<xliff:g id="separator">=</xliff:g>Honolulu<xliff:g id="timezone">|Pacific/Honolulu</xliff:g></string>
+ <string name="C210">K<xliff:g id="separator">=</xliff:g>Kiritimati<xliff:g id="timezone">|Pacific/Kiritimati</xliff:g></string>
+ <string name="C211">N<xliff:g id="separator">=</xliff:g>Noumea<xliff:g id="timezone">|Pacific/Noumea</xliff:g></string>
+ <string name="C214">A<xliff:g id="separator">=</xliff:g>Antigua<xliff:g id="timezone">|America/Antigua</xliff:g></string>
+ <string name="C215">A<xliff:g id="separator">=</xliff:g>Austin<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C216">B<xliff:g id="separator">=</xliff:g>Boston<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C217">C<xliff:g id="separator">=</xliff:g>Calgary<xliff:g id="timezone">|America/Denver</xliff:g></string>
+ <string name="C218">C<xliff:g id="separator">=</xliff:g>Columbus<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C219">D<xliff:g id="separator">=</xliff:g>Dallas<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C220">K<xliff:g id="separator">=</xliff:g>Knoxville<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C221">M<xliff:g id="separator">=</xliff:g>Memphis<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C222">M<xliff:g id="separator">=</xliff:g>Miami<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C223">M<xliff:g id="separator">=</xliff:g>Minneapolis<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C224">O<xliff:g id="separator">=</xliff:g>Ottawa<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C225">P<xliff:g id="separator">=</xliff:g>Philadelphia<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C226">P<xliff:g id="separator">=</xliff:g>Portland<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C227">S<xliff:g id="separator">=</xliff:g>San Diego<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C228">S<xliff:g id="separator">=</xliff:g>San Francisco<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C229">S<xliff:g id="separator">=</xliff:g>Salt Lake City<xliff:g id="timezone">|America/Denver</xliff:g></string>
+ <string name="C230">S<xliff:g id="separator">=</xliff:g>San Jose<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C231">S<xliff:g id="separator">=</xliff:g>San Salvador<xliff:g id="timezone">|America/Guatemala</xliff:g></string>
+ <string name="C232">S<xliff:g id="separator">=</xliff:g>Seattle<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C233">S<xliff:g id="separator">=</xliff:g>St. Louis<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C234">W<xliff:g id="separator">=</xliff:g>Washington D.C.<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C235">H<xliff:g id="separator">=</xliff:g>Houston<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C236">S<xliff:g id="separator">=</xliff:g>San Antonio<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C237">J<xliff:g id="separator">=</xliff:g>Jacksonville<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C238">B<xliff:g id="separator">=</xliff:g>Baltimore<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C239">N<xliff:g id="separator">=</xliff:g>Nashville<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C240">M<xliff:g id="separator">=</xliff:g>Milwaukee<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C241">O<xliff:g id="separator">=</xliff:g>Oklahoma City<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C242">L<xliff:g id="separator">=</xliff:g>Las Vegas<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C243">A<xliff:g id="separator">=</xliff:g>Albuquerque<xliff:g id="timezone">|America/Denver</xliff:g></string>
+ <string name="C244">T<xliff:g id="separator">=</xliff:g>Tucson<xliff:g id="timezone">|MST</xliff:g></string>
+ <string name="C245">S<xliff:g id="separator">=</xliff:g>Sacramento<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C246">A<xliff:g id="separator">=</xliff:g>Atlanta<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C247">C<xliff:g id="separator">=</xliff:g>Cleveland<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C248">N<xliff:g id="separator">=</xliff:g>New Orleans<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C249">T<xliff:g id="separator">=</xliff:g>Tampa<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C250">P<xliff:g id="separator">=</xliff:g>Pittsburgh<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C251">C<xliff:g id="separator">=</xliff:g>Cincinnati<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C252">M<xliff:g id="separator">=</xliff:g>Mountain View<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C253">R<xliff:g id="separator">=</xliff:g>Reno<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C254">B<xliff:g id="separator">=</xliff:g>Black Rock City<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C255">D<xliff:g id="separator">=</xliff:g>Doha<xliff:g id="timezone">|Asia/Riyadh</xliff:g></string>
+ <string name="C256">B<xliff:g id="separator">=</xliff:g>Beijing<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Asia/Shanghai</xliff:g></string>
+ <string name="C257">M<xliff:g id="separator">=</xliff:g>Mumbai<xliff:g id="timezone">|Asia/Kolkata</xliff:g></string>
+ <string name="C258">D<xliff:g id="separator">=</xliff:g>Delhi<xliff:g id="timezone">|Asia/Kolkata</xliff:g></string>
+ <string name="C259">O<xliff:g id="separator">=</xliff:g>Osaka<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Asia/Tokyo</xliff:g></string>
+ <string name="C260">L<xliff:g id="separator">=</xliff:g>Lahore<xliff:g id="timezone">|Asia/Karachi</xliff:g></string>
+ <string name="C261">S<xliff:g id="separator">=</xliff:g>Sana\'a<xliff:g id="timezone">|Asia/Riyadh</xliff:g></string>
+ <string name="C262">B<xliff:g id="separator">=</xliff:g>Barcelona<xliff:g id="timezone">|Europe/Madrid</xliff:g></string>
+ <string name="C263">M<xliff:g id="separator">=</xliff:g>Munich<xliff:g id="timezone">|Europe/Berlin</xliff:g></string>
+ <string name="C264">M<xliff:g id="separator">=</xliff:g>Milan<xliff:g id="timezone">|Europe/Rome</xliff:g></string>
+ <string name="C265">F<xliff:g id="separator">=</xliff:g>Frankfurt<xliff:g id="timezone">|Europe/Berlin</xliff:g></string>
+ <string name="C266">H<xliff:g id="separator">=</xliff:g>Hanoi<xliff:g id="timezone">|Asia/Bangkok</xliff:g></string>
+ <string name="C267">A<xliff:g id="separator">=</xliff:g>Ankara<xliff:g id="timezone">|Europe/Istanbul</xliff:g></string>
+ <string name="C268">B<xliff:g id="separator">=</xliff:g>Bangalore<xliff:g id="timezone">|Asia/Kolkata</xliff:g></string>
+ <string name="C269">B<xliff:g id="separator">=</xliff:g>Brasília<xliff:g id="timezone">|America/Sao_Paulo</xliff:g></string>
+ <string name="C270">C<xliff:g id="separator">=</xliff:g>Cape Town<xliff:g id="timezone">|Africa/Johannesburg</xliff:g></string>
+ <string name="C271">I<xliff:g id="separator">=</xliff:g>Islamabad<xliff:g id="timezone">|Asia/Karachi</xliff:g></string>
+ <string name="C272">R<xliff:g id="separator">=</xliff:g>Rio de Janeiro<xliff:g id="timezone">|America/Sao_Paulo</xliff:g></string>
+ <string name="C273">A<xliff:g id="separator">=</xliff:g>Ann Arbor<xliff:g id="timezone">|America/Detroit</xliff:g></string>
+ <string name="C274">B<xliff:g id="separator">=</xliff:g>Boulder<xliff:g id="timezone">|America/Denver</xliff:g></string>
+ <string name="C275">C<xliff:g id="separator">=</xliff:g>Cambridge<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C276">K<xliff:g id="separator">=</xliff:g>Kirkland<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C277">M<xliff:g id="separator">=</xliff:g>Madison<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C278">G<xliff:g id="separator">=</xliff:g>Guangzhou<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Asia/Shanghai</xliff:g></string>
+ <string name="C279">H<xliff:g id="separator">=</xliff:g>Hyderabad<xliff:g id="timezone">|Asia/Kolkata</xliff:g></string>
+ <string name="C280">R<xliff:g id="separator">=</xliff:g>Reston<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C281">B<xliff:g id="separator">=</xliff:g>Belo Horizonte<xliff:g id="timezone">|America/Sao_Paulo</xliff:g></string>
+ <string name="C282">S<xliff:g id="separator">=</xliff:g>Santiago<xliff:g id="timezone">|America/Santiago</xliff:g></string>
+ <string name="C283">M<xliff:g id="separator">=</xliff:g>Monrovia<xliff:g id="timezone">|Africa/Monrovia</xliff:g></string>
+ <string name="C284">C<xliff:g id="separator">=</xliff:g>Colombo<xliff:g id="timezone">|Asia/Colombo</xliff:g></string>
+ <string name="C285">C<xliff:g id="separator">=</xliff:g>Chihuahua<xliff:g id="timezone">|America/Chihuahua</xliff:g></string>
+ <string name="C286">S<xliff:g id="separator">=</xliff:g>Salvador<xliff:g id="timezone">|America/Sao_Paulo</xliff:g></string>
+ <string name="C287">G<xliff:g id="separator">=</xliff:g>Gurgaon<xliff:g id="timezone">|Asia/Kolkata</xliff:g></string>
+ <string name="C288">M<xliff:g id="separator">=</xliff:g>Manchester<xliff:g id="timezone">|Europe/London</xliff:g></string>
+ <string name="C290">S<xliff:g id="separator">=</xliff:g>St. Petersburg<xliff:g id="timezone">|Europe/Moscow</xliff:g></string>
+ <string name="C291">K<xliff:g id="separator">=</xliff:g>Kraków<xliff:g id="timezone">|Europe/Warsaw</xliff:g></string>
+ <string name="C292">W<xliff:g id="separator">=</xliff:g>Wroclaw<xliff:g id="timezone">|Europe/Warsaw</xliff:g></string>
+ <string name="C293">H<xliff:g id="separator">=</xliff:g>Hamburg<xliff:g id="timezone">|Europe/Berlin</xliff:g></string>
+ <string name="C294">O<xliff:g id="separator">=</xliff:g>Oulu<xliff:g id="timezone">|Europe/Bucharest</xliff:g></string>
+ <string name="C295">H<xliff:g id="separator">=</xliff:g>Haifa<xliff:g id="timezone">|Asia/Jerusalem</xliff:g></string>
+ <string name="C296">S<xliff:g id="separator">=</xliff:g>San Juan<xliff:g id="timezone">|America/Puerto_Rico</xliff:g></string>
+ <string name="C297">T<xliff:g id="separator">=</xliff:g>Tegucigalpa<xliff:g id="timezone">|America/Tegucigalpa</xliff:g></string>
+ <string name="C298">P<xliff:g id="separator">=</xliff:g>Paramaribo<xliff:g id="timezone">|America/Paramaribo</xliff:g></string>
+ <string name="C299">Q<xliff:g id="separator">=</xliff:g>Quito<xliff:g id="timezone">|America/Panama</xliff:g></string>
+ <string name="C300">L<xliff:g id="separator">=</xliff:g>Ljubljana<xliff:g id="timezone">|Europe/Ljubljana</xliff:g></string>
+ <string name="C301">A<xliff:g id="separator">=</xliff:g>Ashgabat<xliff:g id="timezone">|Asia/Ashgabat</xliff:g></string>
+ <string name="C302">A<xliff:g id="separator">=</xliff:g>Asmara<xliff:g id="timezone">|Africa/Asmara</xliff:g></string>
+ <string name="C303">B<xliff:g id="separator">=</xliff:g>Bandar Seri Begawan<xliff:g id="timezone">|Asia/Brunei</xliff:g></string>
+ <string name="C304">B<xliff:g id="separator">=</xliff:g>Bangui<xliff:g id="timezone">|Africa/Bangui</xliff:g></string>
+ <string name="C305">B<xliff:g id="separator">=</xliff:g>Banjul<xliff:g id="timezone">|Africa/Banjul</xliff:g></string>
+ <string name="C306">B<xliff:g id="separator">=</xliff:g>Bishkek<xliff:g id="timezone">|Asia/Bishkek</xliff:g></string>
+ <string name="C307">B<xliff:g id="separator">=</xliff:g>Bissau<xliff:g id="timezone">|Africa/Bissau</xliff:g></string>
+ <string name="C308">B<xliff:g id="separator">=</xliff:g>Bujumbura<xliff:g id="timezone">|Africa/Bujumbura</xliff:g></string>
+ <string name="C309">D<xliff:g id="separator">=</xliff:g>Dili<xliff:g id="timezone">|Asia/Dili</xliff:g></string>
+ <string name="C310">D<xliff:g id="separator">=</xliff:g>Dushanbe<xliff:g id="timezone">|Asia/Dushanbe</xliff:g></string>
+ <string name="C311">F<xliff:g id="separator">=</xliff:g>Funafuti<xliff:g id="timezone">|Pacific/Funafuti</xliff:g></string>
+ <string name="C312">H<xliff:g id="separator">=</xliff:g>Honiara<xliff:g id="timezone">|Pacific/Guadalcanal</xliff:g></string>
+ <string name="C313">J<xliff:g id="separator">=</xliff:g>Juba<xliff:g id="timezone">|Africa/Juba</xliff:g></string>
+ <string name="C314">K<xliff:g id="separator">=</xliff:g>Kingstown<xliff:g id="timezone">|America/St_Vincent</xliff:g></string>
+ <string name="C315">L<xliff:g id="separator">=</xliff:g>Libreville<xliff:g id="timezone">|Africa/Libreville</xliff:g></string>
+ <string name="C316">L<xliff:g id="separator">=</xliff:g>Lomé<xliff:g id="timezone">|Africa/Lome</xliff:g></string>
+ <string name="C317">L<xliff:g id="separator">=</xliff:g>Luanda<xliff:g id="timezone">|Africa/Luanda</xliff:g></string>
+ <string name="C318">L<xliff:g id="separator">=</xliff:g>Lusaka<xliff:g id="timezone">|Africa/Lusaka</xliff:g></string>
+ <string name="C319">M<xliff:g id="separator">=</xliff:g>Majuro<xliff:g id="timezone">|Pacific/Majuro</xliff:g></string>
+ <string name="C320">M<xliff:g id="separator">=</xliff:g>Malabo<xliff:g id="timezone">|Africa/Malabo</xliff:g></string>
+ <string name="C321">M<xliff:g id="separator">=</xliff:g>Maputo<xliff:g id="timezone">|Africa/Maputo</xliff:g></string>
+ <string name="C322">M<xliff:g id="separator">=</xliff:g>Mbabane<xliff:g id="timezone">|Africa/Mbabane</xliff:g></string>
+ <string name="C323">M<xliff:g id="separator">=</xliff:g>Moroni<xliff:g id="timezone">|Indian/Comoro</xliff:g></string>
+ <string name="C324">N<xliff:g id="separator">=</xliff:g>N\'Djamena<xliff:g id="timezone">|Africa/Ndjamena</xliff:g></string>
+ <string name="C325">N<xliff:g id="separator">=</xliff:g>Ngerulmud<xliff:g id="timezone">|Pacific/Palau</xliff:g></string>
+ <string name="C326">N<xliff:g id="separator">=</xliff:g>Niamey<xliff:g id="timezone">|Africa/Niamey</xliff:g></string>
+ <string name="C327">N<xliff:g id="separator">=</xliff:g>Nicosia<xliff:g id="timezone">|Europe/Nicosia</xliff:g></string>
+ <string name="C328">N<xliff:g id="separator">=</xliff:g>Nouakchott<xliff:g id="timezone">|Africa/Nouakchott</xliff:g></string>
+ <string name="C329">N<xliff:g id="separator">=</xliff:g>Nuku\'alofa<xliff:g id="timezone">|Pacific/Tongatapu</xliff:g></string>
+ <string name="C330">O<xliff:g id="separator">=</xliff:g>Ouagadougou<xliff:g id="timezone">|Africa/Ouagadougou</xliff:g></string>
+ <string name="C331">P<xliff:g id="separator">=</xliff:g>Palikir<xliff:g id="timezone">|Pacific/Noumea</xliff:g></string>
+ <string name="C332">P<xliff:g id="separator">=</xliff:g>Philipsburg<xliff:g id="timezone">|America/Lower_Princes</xliff:g></string>
+ <string name="C333">P<xliff:g id="separator">=</xliff:g>Podgorica<xliff:g id="timezone">|Europe/Podgorica</xliff:g></string>
+ <string name="C334">P<xliff:g id="separator">=</xliff:g>Port Moresby<xliff:g id="timezone">|Pacific/Palau</xliff:g></string>
+ <string name="C335">P<xliff:g id="separator">=</xliff:g>Port Vila<xliff:g id="timezone">|Pacific/Efate</xliff:g></string>
+ <string name="C336">P<xliff:g id="separator">=</xliff:g>Porto-Novo<xliff:g id="timezone">|Africa/Porto-Novo</xliff:g></string>
+ <string name="C337">P<xliff:g id="separator">=</xliff:g>Priština<xliff:g id="timezone">|Europe/Belgrade</xliff:g></string>
+ <string name="C338">R<xliff:g id="separator">=</xliff:g>Roseau<xliff:g id="timezone">|America/Dominica</xliff:g></string>
+ <string name="C339">T<xliff:g id="separator">=</xliff:g>Tashkent<xliff:g id="timezone">|Asia/Tashkent</xliff:g></string>
+ <string name="C340">T<xliff:g id="separator">=</xliff:g>Tbilisi<xliff:g id="timezone">|Asia/Tbilisi</xliff:g></string>
+ <string name="C341">T<xliff:g id="separator">=</xliff:g>Thimphu<xliff:g id="timezone">|Asia/Thimphu</xliff:g></string>
+ <string name="C342">T<xliff:g id="separator">=</xliff:g>Tirana<xliff:g id="timezone">|Europe/Tirane</xliff:g></string>
+ <string name="C343">V<xliff:g id="separator">=</xliff:g>Vaduz<xliff:g id="timezone">|Europe/Vaduz</xliff:g></string>
+ <string name="C344">V<xliff:g id="separator">=</xliff:g>Vientiane<xliff:g id="timezone">|Asia/Vientiane</xliff:g></string>
+ <string name="C345">W<xliff:g id="separator">=</xliff:g>Windhoek<xliff:g id="timezone">|Africa/Windhoek</xliff:g></string>
+ <string name="C346">Y<xliff:g id="separator">=</xliff:g>Yaoundé<xliff:g id="timezone">|Africa/Douala</xliff:g></string>
+ <string name="C347">Y<xliff:g id="separator">=</xliff:g>Yaren District<xliff:g id="timezone">|Pacific/Nauru</xliff:g></string>
+ <string name="C348">Y<xliff:g id="separator">=</xliff:g>Yerevan<xliff:g id="timezone">|Asia/Yerevan</xliff:g></string>
+</resources>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
new file mode 100644
index 0000000..d6c0b48
--- /dev/null
+++ b/res/values-ast-rES/cm_strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Aición al voltiar el preséu</string>
+ <string name="shake_action_title">Aición al ximelgar el preséu</string>
+ <string-array name="action_setting_entries">
+ <item>Posponer</item>
+ <item>Escartar</item>
+ <item>Nada</item>
+ </string-array>
+</resources>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
new file mode 100644
index 0000000..b556807
--- /dev/null
+++ b/res/values-ast-rES/strings.xml
@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 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.
+ -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+ <string name="app_label">Reló</string>
+ <string name="label">Nome l\'alarma</string>
+ <string name="default_label">Alarma</string>
+ <string name="alarm_vibrate">Vibrar</string>
+ <string name="alarm_repeat">Repitir</string>
+ <string name="delete">Desaniciar</string>
+ <string name="default_timer_ringtone_title">Caducó\'l temporizador</string>
+ <string name="alarm_tomorrow">Mañana</string>
+ <string name="alarm_today">Güei</string>
+ <string name="alarm_alert_dismiss_text">Escartar</string>
+ <string name="alarm_missed_title">Alarma perdida</string>
+ <string name="alarm_alert_snoozed_text">Snoozed</string>
+ <plurals name="alarm_alert_snooze_duration">
+ <item quantity="one">1 min</item>
+ <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> mins</item>
+ </plurals>
+ <string name="alarm_alert_off_text">Alarma apagada</string>
+ <string name="alarm_alert_snooze_text">Posponer</string>
+ <plurals name="alarm_alert_snooze_set">
+ <item quantity="one">Pospuesta 1 minutu.</item>
+ <item quantity="other">Pospuesta <xliff:g id="MINUTES">%d</xliff:g> minutos.</item>
+ </plurals>
+ <string name="alarm_alert_snooze_until">Repetir a les <xliff:g id="TIME">%s</xliff:g></string>
+ <string name="alarm_alert_predismiss_title">Próxima alarma</string>
+ <string name="missed_alarm_has_been_deleted">Desaniciáronse les alarmes perdíes</string>
+ <string name="timer_notifications_less_min">Queda menos de 1 minutu</string>
+ <string name="timer_notifications_hours"><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"><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">Queden <xliff:g id="HOURS">%1$s</xliff:g> y <xliff:g id="MINUTES">%2$s</xliff:g></string>
+ <string name="timer_notifications_seconds"><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"><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"><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"><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">Amestáu un minutu al cronu, <xliff:g id="TIME" example="5 hours remaining">%1$s</xliff:g></string>
+ <string name="timer_accessibility_stopped">Cronu posáu, <xliff:g id="TIME" example="5 hours remaining">%1$s</xliff:g></string>
+ <string name="timer_accessibility_started">Cronu funcionando, <xliff:g id="TIME" example="5 hours remaining">%1$s</xliff:g></string>
+ <string name="timer_remaining_single">restante</string>
+ <string name="timer_remaining_multiple">restantes</string>
+ <string-array name="alarm_set">
+ <item>L\'alarma va sonar en menos d\'un minutu.</item>
+ <item>L\'alarma va sonar en <xliff:g id="DAYS">%1$s</xliff:g>.</item>
+ <item>L\'alarma va sonar en <xliff:g id="HOURS">%2$s</xliff:g>.</item>
+ <item>L\'alarma va sonar en <xliff:g id="DAYS">%1$s</xliff:g> y <xliff:g id="HOURS">%2$s</xliff:g>.</item>
+ <item>L\'alarma va sonar en <xliff:g id="MINUTES">%3$s</xliff:g>.</item>
+ <item>L\'alarma va sonar en <xliff:g id="DAYS">%1$s</xliff:g> y <xliff:g id="MINUTES">%3$s</xliff:g>.</item>
+ <item>L\'alarma va sonar en <xliff:g id="HOURS">%2$s</xliff:g> y <xliff:g id="MINUTES">%3$s</xliff:g>.</item>
+ <item>L\'alarma va sonar en <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> y <xliff:g id="MINUTES">%3$s</xliff:g>.</item>
+ </string-array>
+ <plurals name="days">
+ <item quantity="one">1 día</item>
+ <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> díes</item>
+ </plurals>
+ <plurals name="hours">
+ <item quantity="one">1 hora</item>
+ <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> hores</item>
+ </plurals>
+ <plurals name="minutes">
+ <item quantity="one">1 minutu</item>
+ <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> minutos</item>
+ </plurals>
+ <string name="every_day">Tolos díes</string>
+ <string name="day_concat">", "</string>
+ <string name="loading_widget">Cargando\u2026</string>
+ <string name="analog_gadget">Reló analóxicu</string>
+ <string name="digital_gadget">Reló dixital</string>
+ <string name="settings">Axustes</string>
+ <string name="snooze_duration_title">Repetir alarma dempués de</string>
+ <string name="crescendo_duration_title">Aumentar adulces el volume</string>
+ <string name="auto_silence_title">Silenciar dempués de</string>
+ <plurals name="auto_silence_summary">
+ <item quantity="one">1 minutu</item>
+ <item quantity="other"><xliff:g id="formatted_number" example="7">%s</xliff:g> minutos</item>
+ </plurals>
+ <string name="auto_silence_never">Enxamás</string>
+ <string-array name="auto_silence_entries">
+ <item>1 minutu</item>
+ <item>5 minutos</item>
+ <item>10 minutos</item>
+ <item>15 minutos</item>
+ <item>20 minutos</item>
+ <item>25 minutos</item>
+ <item>Nunca</item>
+ </string-array>
+ <string-array name="crescendo_entries">
+ <item>Non</item>
+ <item>5 seconds</item>
+ <item>10 seconds</item>
+ <item>15 seconds</item>
+ <item>20 seconds</item>
+ <item>25 seconds</item>
+ <item>30 seconds</item>
+ <item>35 seconds</item>
+ <item>40 seconds</item>
+ <item>45 seconds</item>
+ <item>50 seconds</item>
+ <item>55 seconds</item>
+ <item>60 seconds</item>
+ </string-array>
+ <string-array name="snooze_duration_entries">
+ <item>1 minutu</item>
+ <item>2 minutes</item>
+ <item>3 minutes</item>
+ <item>4 minutes</item>
+ <item>5 minutos</item>
+ <item>6 minutes</item>
+ <item>7 minutes</item>
+ <item>8 minutes</item>
+ <item>9 minutes</item>
+ <item>10 minutos</item>
+ <item>11 minutes</item>
+ <item>12 minutes</item>
+ <item>13 minutes</item>
+ <item>14 minutes</item>
+ <item>15 minutos</item>
+ <item>16 minutes</item>
+ <item>17 minutes</item>
+ <item>18 minutes</item>
+ <item>19 minutes</item>
+ <item>20 minutos</item>
+ <item>21 minutes</item>
+ <item>22 minutes</item>
+ <item>23 minutes</item>
+ <item>24 minutes</item>
+ <item>25 minutos</item>
+ <item>26 minutes</item>
+ <item>27 minutes</item>
+ <item>28 minutes</item>
+ <item>29 minutes</item>
+ <item>30 minutes</item>
+ </string-array>
+ <string name="week_start_title">Entamar la selmana el</string>
+ <string-array name="week_start_entries">
+ <item>Sábadu</item>
+ <item>Domingu</item>
+ <item>Llunes</item>
+ </string-array>
+ <string name="alarm_volume_title">Volume d\'alarma</string>
+ <string name="silent_ringtone_title">Silenciu</string>
+ <string name="unknown_ringtone_title">Desconocíu</string>
+ <string name="alarm_volume_muted">Volume de l\'alarma matáu</string>
+ <string name="unmute_alarm_volume">Activar soníu</string>
+ <string name="silent_default_alarm_ringtone">El tonu por defeutu de l\'alarma ta matáu</string>
+ <string name="change_setting_action">Camudar</string>
+ <string name="app_notifications_blocked">Les notificaciones del reló tán torgaes</string>
+ <string name="alarms_blocked_by_dnd">El preséu ta configuráu pa silenciu ensembre</string>
+ <string name="volume_button_setting_title">Botones de volume</string>
+ <string-array name="volume_button_setting_entries">
+ <item>Posponer l\'alarma</item>
+ <item>Escartar</item>
+ <item>Controlar volume</item>
+ </string-array>
+ <string name="label_description">Nome</string>
+ <string name="ringtone_description">Timbre</string>
+ <string name="menu_alarm">Alarma</string>
+ <string name="menu_timer">Temporizador</string>
+ <string name="menu_clock">Reló</string>
+ <string name="menu_stopwatch">Cronómetru</string>
+ <string name="button_alarms">Amestar alarma</string>
+ <string name="button_cities">Ciudaes</string>
+ <string name="menu_item_settings">Axustes</string>
+ <string name="menu_item_help">Ayuda</string>
+ <string name="menu_item_sort_by_gmt_offset">Ordenar por hora</string>
+ <string name="menu_item_sort_by_name">Ordenar por nome</string>
+ <string name="selected_cities_label">Ciudaes esbillaes</string>
+ <string name="sw_resume_button">Reanudar</string>
+ <string name="sw_reset_button">Llimpiar</string>
+ <string name="sw_start_button">Aniciar</string>
+ <string name="sw_pause_button">Posar</string>
+ <string name="sw_lap_button">Amestar vuelta</string>
+ <string name="sw_share_button">Compartir</string>
+ <string name="hours_label">h</string>
+ <string name="minutes_label">m</string>
+ <string name="seconds_label">s</string>
+ <string name="sw_share_main">Hora: <xliff:g id="TIME">%s</xliff:g></string>
+ <string name="sw_share_laps">Duración de les vueltes:</string>
+ <string name="sw_notification_lap_number">Fase <xliff:g id="NUMBER">%d</xliff:g></string>
+ <string name="timer_add_timer">Amestar temporizador</string>
+ <string name="timer_start">Aniciar</string>
+ <string name="timer_delete">Desaniciar</string>
+ <string name="timer_descriptive_delete">Desaniciar <xliff:g id="number_string">%s</xliff:g></string>
+ <string name="timer_plus_one">Amestar 1 minutu</string>
+ <string name="timer_plus_1_min">Añadir 1 min</string>
+ <string name="timer_stop">Detener</string>
+ <string name="timer_stop_all">Parar tolos temporizadores</string>
+ <string name="timer_reset">Llimpiar</string>
+ <string name="timer_cancel">Encaboxar</string>
+ <string name="timer_canceled">Encaboxóse\'l temporizador</string>
+ <string name="timer_times_up">Tiempu agotáu</string>
+ <string name="timer_multi_times_up"><xliff:g id="NUM_TIMERS" example="2">%d</xliff:g> temporizadores deteníos</string>
+ <string name="timer_multi_missed"><xliff:g id="number" example="2">%d</xliff:g> cronos despaecíos</string>
+ <string name="timer_notification_label">Temporizador</string>
+ <string name="missed_timer_notification_label">Cronu desapaecíu</string>
+ <string name="missed_named_timer_notification_label">Cronu desapaecíu: <xliff:g id="name" example="Pick up kids">%s</xliff:g></string>
+ <string name="timer_pause">Posar</string>
+ <string name="timer_reset_all">Reaniciar tolos temporizadores</string>
+ <string-array name="sw_share_strings" translatable="true">
+ <item>Yes el rei de la velocidá.</item>
+ <item>Esfruta de los frutos del to trabayu.</item>
+ <item>Los androides son conocíos por ser rápidos, pero non tanto como tu.</item>
+ <item>¡Uf!</item>
+ <item>L33t vegaes</item>
+ <item>Una velocidá ablucante</item>
+ <item>Vamos a saltar nel tiempu otra vegada.</item>
+ <item>Namái un saltu a la esquierda</item>
+ <item>Tienes munches coses que facer en pocu tiempu.</item>
+ <item>Velocidá fotónica</item>
+ </string-array>
+ <string name="home_label">Casa</string>
+ <string name="cities_activity_title">Ciudaes</string>
+ <string name="clock_settings">Reló</string>
+ <string name="clock_style">Estilu</string>
+ <string name="display_clock_seconds_pref">Pantalla de tiempu con segundos</string>
+ <string name="open_date_settings">Camudar data \u0026 y hora</string>
+ <string-array name="clock_style_entries">
+ <item>Analóxicu</item>
+ <item>Dixital</item>
+ </string-array>
+ <string name="automatic_home_clock">Reló de la to ciudá automáticu</string>
+ <string name="automatic_home_clock_summary">Cuando viaxes a una zona con una hora diferente, amiesta un reló pa la hora de la to ciudá</string>
+ <string name="home_time_zone">Estaya horaria llocal</string>
+ <string name="home_time_zone_title">Estaya horaria llocal</string>
+ <string name="city_checked"><xliff:g id="city_name">%s</xliff:g> xequeáu</string>
+ <string name="city_unchecked"><xliff:g id="city_name">%s</xliff:g> ensin xequiar</string>
+ <string-array name="timezone_labels" tools:ignore="Typos">
+ <item>"Islles Marshall"</item>
+ <item>"Islles Midway"</item>
+ <item>"Hawái"</item>
+ <item>"Alaska"</item>
+ <item>"Hora del Pacíficu"</item>
+ <item>"Tijuana"</item>
+ <item>"Arizona"</item>
+ <item>"Chihuahua"</item>
+ <item>"Hora de les Montañes Rocoses"</item>
+ <item>"Centroamérica"</item>
+ <item>"Hora central"</item>
+ <item>"Ciudá de Méxicu"</item>
+ <item>"Saskatchewan"</item>
+ <item>"Bogotá"</item>
+ <item>"Hora del Este"</item>
+ <item>"Venezuela"</item>
+ <item>"Hora del Atlánticu (Barbados)"</item>
+ <item>"Hora del Atlánticu (Canadá)"</item>
+ <item>"Manaos"</item>
+ <item>"Santiago"</item>
+ <item>"Terranova"</item>
+ <item>"Brasilia"</item>
+ <item>"Buenos Aires"</item>
+ <item>"Groenlandia"</item>
+ <item>"Montevidéu"</item>
+ <item>"Atlánticu Mediu"</item>
+ <item>"Azores"</item>
+ <item>"Islles de Cabu Verde"</item>
+ <item>"Casablanca"</item>
+ <item>"Londres, Dublín"</item>
+ <item>"Ámsterdam, Berlín"</item>
+ <item>"Belgráu"</item>
+ <item>"Bruxeles"</item>
+ <item>"Sarayevu"</item>
+ <item>"Windhoek"</item>
+ <item>"Hora África Occidental"</item>
+ <item>"Amán, Xordania"</item>
+ <item>"Atenes, Estambul"</item>
+ <item>"Beirut, Líbanu"</item>
+ <item>"El Cairu"</item>
+ <item>"Helsinki"</item>
+ <item>"Xerusalén"</item>
+ <item>"Minsk"</item>
+ <item>"Harare"</item>
+ <item>"Bagdad"</item>
+ <item>"Moscú"</item>
+ <item>"Kuwait"</item>
+ <item>"Nairobi"</item>
+ <item>"Teḥrán"</item>
+ <item>"Bakú"</item>
+ <item>"Tiflis"</item>
+ <item>"Ereván"</item>
+ <item>"Dubái"</item>
+ <item>"Kabul"</item>
+ <item>"Islamabad, Karachi"</item>
+ <item>"Oral"</item>
+ <item>"Ekaterimburgu"</item>
+ <item>"Calcuta"</item>
+ <item>"Sri Lanka"</item>
+ <item>"Katmandú"</item>
+ <item>"Astaná"</item>
+ <item>"Rangún"</item>
+ <item>"Krasnoyarsk"</item>
+ <item>"Bangkok"</item>
+ <item>"Pequín"</item>
+ <item>"Hong Kong"</item>
+ <item>"Irkutsk"</item>
+ <item>"Kuala Lumpur"</item>
+ <item>"Perth"</item>
+ <item>"Taipei"</item>
+ <item>"Seúl"</item>
+ <item>"Tokiu, Osaka"</item>
+ <item>"Yakutsk"</item>
+ <item>"Adelaida"</item>
+ <item>"Darwin"</item>
+ <item>"Brisbane"</item>
+ <item>"Hobart"</item>
+ <item>"Sidney, Canberra"</item>
+ <item>"Vladivostok"</item>
+ <item>"Guam"</item>
+ <item>"Magadán"</item>
+ <item>"Auckland"</item>
+ <item>"Fixi"</item>
+ <item>"Tonga"</item>
+ <item>"Xakarta"</item>
+ </string-array>
+ <string name="shortcut_new_alarm_short">Alarma nueva</string>
+ <string name="shortcut_new_alarm_long">Crear una alarma nueva</string>
+ <string name="shortcut_new_timer_short">Temporizador nuevu</string>
+ <string name="shortcut_new_timer_long">Crear un temporizador nuevu</string>
+ <string name="shortcut_start_stopwatch_short">Aniciar</string>
+ <string name="shortcut_start_stopwatch_long">Arrancar cronómetru</string>
+ <string name="shortcut_pause_stopwatch_short">Posar</string>
+ <string name="shortcut_pause_stopwatch_long">Posar cronómetru</string>
+ <string name="shortcut_start_screensaver_short">Curiapantalles</string>
+ <string name="shortcut_start_screensaver_long">Arrancar un curiapantalles</string>
+ <string name="alarm_settings">Alarmes</string>
+ <string name="timer_service_desc">Procesa les aiciones de los avisos del temporizador.</string>
+ <string name="stopwatch_service_desc">Procesa les aiciones de los avisos del cronómetru.</string>
+ <string name="swn_paused">Posáu</string>
+ <string name="description_direction_right">Esliza pa la drecha pa escartar</string>
+ <string name="description_direction_left">Esliza pa la esquierda pa posponer</string>
+ <string name="description_direction_both">Esliza\'l deu a manzorga pa posponer l\'alarma o a mandrecha pa inorala</string>
+ <string name="timer_settings">Temporizadores</string>
+ <string name="timer_vibrate_title">Temporizador en vibración</string>
+ <string name="timer_paused">Posóse\'l temporizador</string>
+ <string name="timers_stopped"><xliff:g id="Number">%d</xliff:g> temporizadores posaos</string>
+ <string name="all_timers_stopped_notif">Calca pa ver los tos temporizadores</string>
+ <string name="timers_in_use"><xliff:g id="NUMBER">%d</xliff:g> temporizadores</string>
+ <string name="next_timer_notif">Próximu temporizador: <xliff:g id="TIME_REMAINING">%s</xliff:g></string>
+ <string name="screensaver_settings">Axustes de guardáu de la pantalla</string>
+ <string name="night_mode_title">Mou nocherniegu</string>
+ <string name="night_mode_summary">Pantalla amatagada (pa espacios escuros)</string>
+ <string name="expand_alarm">Espander alarma</string>
+ <string name="collapse_alarm">Contrayer alarma</string>
+ <string name="alarm_undo">desfacer</string>
+ <string name="alarm_deleted">Alarma desaniciada</string>
+ <string name="world_day_of_week_label">/ <xliff:g id="LABEL">%s</xliff:g></string>
+ <string name="world_time_ahead"><xliff:g id="time" example="6 hours">%1$s</xliff:g> alantre</string>
+ <string name="world_time_behind"><xliff:g id="time" example="4 hours">%1$s</xliff:g> atrás</string>
+ <string name="world_hours_minutes_ahead"><xliff:g id="hours" example="6 hr">%1$s</xliff:g> <xliff:g id="minutes" example="30 min">%2$s</xliff:g> alantre</string>
+ <string name="world_hours_minutes_behind"><xliff:g id="hours" example="4 hr">%1$s</xliff:g> <xliff:g id="minutes" example="30 min">%2$s</xliff:g> atrás</string>
+ <string name="world_hours_tomorrow">Mañana, <xliff:g id="time" example="6 hours ahead">%1$s</xliff:g></string>
+ <string name="world_hours_yesterday">Ayeri, <xliff:g id="time" example="4 hours behind">%1$s</xliff:g></string>
+ <string name="world_tomorrow">Mañana</string>
+ <string name="world_yesterday">Ayeri</string>
+ <string name="next_alarm_description">Próxima alarma: <xliff:g id="ALARM_TIME">%s</xliff:g></string>
+ <string name="no_alarms">Nun hai alarmes</string>
+ <string name="invalid_time">Tiempu inválidu <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">Nun hai alarma pa les <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">Nun hai alarmes programaes</string>
+ <string name="no_label_specified">Nun s\'especificó nenguna etiqueta</string>
+ <string name="no_alarms_with_label">Nun hai nenguna alarma con esa etiqueta</string>
+ <string name="no_alarm_scheduled_for_this_time">Nun se planificaron alarmes pa esta hora</string>
+ <string name="alarm_is_dismissed">Inoróse l\'alarma <xliff:g id="alarm_time" example="14:20">%s</xliff:g></string>
+ <string name="alarm_is_set">Afitóse l\'alarma a les <xliff:g id="alarm_time" example="14:20">%s</xliff:g></string>
+ <string name="timer_created">Creóse\'l temporizador</string>
+ <plurals name="expired_timers_dismissed">
+ <item quantity="one">Temporidador de despidu</item>
+ <item quantity="other"><xliff:g id="number" example="5">%d</xliff:g> temporizadores de despidu</item>
+ </plurals>
+ <string name="timer_deleted">Desanicióse\'l temporizador</string>
+ <string name="invalid_timer_length">La duración del temporizador nun ye válida</string>
+ <string name="invalid_timer">Temporizador escoyíu inválidu</string>
+ <string name="no_expired_timers">Temporizadores non cadudaos</string>
+ <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away">Aínda nun pue inorase l\'alarma <xliff:g id="alarm_time" example="14:20">%s</xliff:g> porque entá falten más de 24 hores pa que s\'active</string>
+ <string name="dismiss_alarm">Inorar alarma</string>
+ <string name="pick_alarm_to_dismiss">Esbilla l\'alarma que quies inorar</string>
+ <string name="no_firing_alarms">Nun hai alarmes actives</string>
+ <string name="alarm_is_snoozed">L\'alarma <xliff:g id="alarm_time" example="14:20">%s</xliff:g> pospúsose por diez minutos</string>
+</resources>
diff --git a/res/values-az/cm_strings.xml b/res/values-az/cm_strings.xml
new file mode 100644
index 0000000..1c12bb7
--- /dev/null
+++ b/res/values-az/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Cihazı çevirmə hərəkəti</string>
+ <string name="shake_action_title">Cihaz silkələmə hərəkəti</string>
+ <string-array name="action_setting_entries">
+ <item>Ertələ</item>
+ <item>Rədd et</item>
+ <item>Heç biri</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Vacib zəngli saatlar və vaxtölçənlər</string>
+ <string name="alarm_missed_channel">Buraxılmış zəngli saatlar</string>
+ <string name="alarm_snooze_channel">Ertələnmiş zəngli saatlar</string>
+ <string name="alarm_upcoming_channel">Yaxınlaşan zəngli saatlar</string>
+ <string name="stopwatch_channel">Saniyəölçən</string>
+ <string name="timer_channel">Vaxtölçən</string>
+</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index a50a67e..b1a25f4 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Bu gün"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Burax"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Buraxılmış zənglər"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Mürgülü"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> dəq</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Buraxılmış taymer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Durdurun"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Bütün taymerləri sıfırlayın"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 988ebec..f5075ca 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Danas"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Odbaci"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Propušteni alarm"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Odloženo"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -248,8 +248,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Propušteni tajmer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pauziraj"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Res. sve tajm."</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 8a664e0..21b7c28 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> хв</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Прапушчаны таймер: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Прыпыніць"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Скінуць усе таймеры"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
new file mode 100644
index 0000000..3993034
--- /dev/null
+++ b/res/values-bg/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Действие при обръщане</string>
+ <string name="shake_action_title">Действие при разклащане</string>
+ <string-array name="action_setting_entries">
+ <item>Отлагане</item>
+ <item>Отхвърли</item>
+ <item>Нищо</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Стартиране на аларми & таймери</string>
+ <string name="alarm_missed_channel">Пропуснати аларми</string>
+ <string name="alarm_snooze_channel">Отложени аларми</string>
+ <string name="alarm_upcoming_channel">Предстоящи аларми</string>
+ <string name="stopwatch_channel">Хронометър</string>
+ <string name="timer_channel">Таймер</string>
+</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index fa16951..5cbc4e0 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> мин</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Пропуснат таймер: „<xliff:g id="NAME">%s</xliff:g>“"</string>
<string name="timer_pause" msgid="3748323712728398743">"Пауза"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Нулиране на всички таймери"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 94e4c83..ea33f9d 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> মিনিট</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"মিস করা টাইমার: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"বিরাম দিন"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"সমস্ত টাইমার আবার সেট করুন"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index d8de867..3028e86 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Danas"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Odbaci"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Propušteni alarm"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Odloženo"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min.</item>
@@ -248,8 +248,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Propušteni tajmer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pauziraj"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Poništi sve tajmere"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
new file mode 100644
index 0000000..d93d123
--- /dev/null
+++ b/res/values-ca/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Acció girar del dispositiu</string>
+ <string name="shake_action_title">Acció agitar del dispositiu</string>
+ <string-array name="action_setting_entries">
+ <item>Posposa</item>
+ <item>Descarta</item>
+ <item>Res</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Desencadena alarmes i temporitzadors</string>
+ <string name="alarm_missed_channel">Alarmes perdudes</string>
+ <string name="alarm_snooze_channel">Alarmes posposades</string>
+ <string name="alarm_upcoming_channel">Properes alarmes</string>
+ <string name="stopwatch_channel">Cronòmetre</string>
+ <string name="timer_channel">Temporitzador</string>
+</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d79f6c1..883ca84 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Avui"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Ignora"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarma perduda"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Posposada"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Temporitzador desatès: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Posa en pausa"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Restableix tots els temporitz."</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
new file mode 100644
index 0000000..fa3779c
--- /dev/null
+++ b/res/values-cs/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Akce při otočení zařízení</string>
+ <string name="shake_action_title">Akce při zatřesení zařízením</string>
+ <string-array name="action_setting_entries">
+ <item>Odložit</item>
+ <item>Zamítnout</item>
+ <item>Nic</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Výstražné budíky a\u00a0časovače</string>
+ <string name="alarm_missed_channel">Zmeškané budíky</string>
+ <string name="alarm_snooze_channel">Odložené budíky</string>
+ <string name="alarm_upcoming_channel">Nadcházející budíky</string>
+ <string name="stopwatch_channel">Stopky</string>
+ <string name="timer_channel">Časovač</string>
+</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index db5bea1..832a23d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Dnes"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Zavřít"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Zmeškaný budík"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Odloženo"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Zmeškaný časovač: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pozastavit"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Reset časovačů"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-cy/cities.xml b/res/values-cy/cities.xml
new file mode 100644
index 0000000..7b6a6b1
--- /dev/null
+++ b/res/values-cy/cities.xml
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 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
+ -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools" tools:ignore="Typos">
+ <string name="C1">A<xliff:g id="separator">=</xliff:g>Abidjan<xliff:g id="timezone">|Affrica/Abidjan</xliff:g></string>
+ <string name="C2">A<xliff:g id="separator">=</xliff:g>Accra<xliff:g id="timezone">|Affrica/Accra</xliff:g></string>
+ <string name="C3">A<xliff:g id="separator">=</xliff:g>Addis Ababa<xliff:g id="timezone">|Affrica/Addis_Ababa</xliff:g></string>
+ <string name="C4">A<xliff:g id="separator">=</xliff:g>Algiers<xliff:g id="timezone">|Affrica/Algiers</xliff:g></string>
+ <string name="C5">B<xliff:g id="separator">=</xliff:g>Blantyre<xliff:g id="timezone">|Affrica/Blantyre</xliff:g></string>
+ <string name="C6">B<xliff:g id="separator">=</xliff:g>Brazzaville<xliff:g id="timezone">|Affrica/Brazzaville</xliff:g></string>
+ <string name="C7">C<xliff:g id="separator">=</xliff:g>Cairo<xliff:g id="timezone">|Affrica/Cairo</xliff:g></string>
+ <string name="C8">C<xliff:g id="separator">=</xliff:g>Casablanca<xliff:g id="timezone">|Affrica/Casablanca</xliff:g></string>
+ <string name="C9">C<xliff:g id="separator">=</xliff:g>Conakry<xliff:g id="timezone">|Affrica/Conakry</xliff:g></string>
+ <string name="C10">D<xliff:g id="separator">=</xliff:g>Dakar<xliff:g id="timezone">|Affrica/Dakar</xliff:g></string>
+ <string name="C11">D<xliff:g id="separator">=</xliff:g>Dar es Salaam<xliff:g id="timezone">|Affrica/Dar_es_Salaam</xliff:g></string>
+ <string name="C12">D<xliff:g id="separator">=</xliff:g>Djibouti<xliff:g id="timezone">|Affrica/Djibouti</xliff:g></string>
+ <string name="C13">F<xliff:g id="separator">=</xliff:g>Freetown<xliff:g id="timezone">|Affrica/Freetown</xliff:g></string>
+ <string name="C14">G<xliff:g id="separator">=</xliff:g>Gaborone<xliff:g id="timezone">|Affrica/Gaborone</xliff:g></string>
+ <string name="C15">H<xliff:g id="separator">=</xliff:g>Harare<xliff:g id="timezone">|Affrica/Harare</xliff:g></string>
+ <string name="C16">J<xliff:g id="separator">=</xliff:g>Johannesburg<xliff:g id="timezone">|Affrica/Johannesburg</xliff:g></string>
+ <string name="C17">K<xliff:g id="separator">=</xliff:g>Kampala<xliff:g id="timezone">|Affrica/Kampala</xliff:g></string>
+ <string name="C18">K<xliff:g id="separator">=</xliff:g>Khartoum<xliff:g id="timezone">|Affrica/Khartoum</xliff:g></string>
+ <string name="C19">K<xliff:g id="separator">=</xliff:g>Kigali<xliff:g id="timezone">|Affrica/Kigali</xliff:g></string>
+ <string name="C20">K<xliff:g id="separator">=</xliff:g>Kinshasa<xliff:g id="timezone">|Affrica/Kinshasa</xliff:g></string>
+ <string name="C21">L<xliff:g id="separator">=</xliff:g>Lagos<xliff:g id="timezone">|Affrica/Lagos</xliff:g></string>
+ <string name="C22">M<xliff:g id="separator">=</xliff:g>Maseru<xliff:g id="timezone">|Affrica/Maseru</xliff:g></string>
+ <string name="C23">M<xliff:g id="separator">=</xliff:g>Mogadishu<xliff:g id="timezone">|Affrica/Mogadishu</xliff:g></string>
+ <string name="C24">N<xliff:g id="separator">=</xliff:g>Nairobi<xliff:g id="timezone">|Affrica/Nairobi</xliff:g></string>
+ <string name="C25">S<xliff:g id="separator">=</xliff:g>São Tomé<xliff:g id="timezone">|Affrica/Sao_Tome</xliff:g></string>
+ <string name="C26">T<xliff:g id="separator">=</xliff:g>Timbuktu<xliff:g id="timezone">|Affrica/Timbuktu</xliff:g></string>
+ <string name="C27">T<xliff:g id="separator">=</xliff:g>Tripoli<xliff:g id="timezone">|Affrica/Tripoli</xliff:g></string>
+ <string name="C28">T<xliff:g id="separator">=</xliff:g>Tunis<xliff:g id="timezone">|Affrica/Tunis</xliff:g></string>
+ <string name="C29">A<xliff:g id="separator">=</xliff:g>Anchorage<xliff:g id="timezone">|America/Anchorage</xliff:g></string>
+ <string name="C31">A<xliff:g id="separator">=</xliff:g>Aruba<xliff:g id="timezone">|America/Aruba</xliff:g></string>
+ <string name="C32">A<xliff:g id="separator">=</xliff:g>Asunción<xliff:g id="timezone">|America/Asuncion</xliff:g></string>
+ <string name="C33">B<xliff:g id="separator">=</xliff:g>Barbados<xliff:g id="timezone">|America/Barbados</xliff:g></string>
+ <string name="C34">B<xliff:g id="separator">=</xliff:g>Belîs<xliff:g id="timezone">|America/Belîs</xliff:g></string>
+ <string name="C35">B<xliff:g id="separator">=</xliff:g>Bogotá<xliff:g id="timezone">|America/Bogota</xliff:g></string>
+ <string name="C36">B<xliff:g id="separator">=</xliff:g>Buenos Aires<xliff:g id="timezone">|America/Buenos_Aires</xliff:g></string>
+ <string name="C37">C<xliff:g id="separator">=</xliff:g>Cancun<xliff:g id="timezone">|America/Cancun</xliff:g></string>
+ <string name="C38">C<xliff:g id="separator">=</xliff:g>Caracas<xliff:g id="timezone">|America/Caracas</xliff:g></string>
+ <string name="C39">C<xliff:g id="separator">=</xliff:g>Cayman<xliff:g id="timezone">|America/Cayman</xliff:g></string>
+ <string name="C40">C<xliff:g id="separator">=</xliff:g>Chicago<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C42">C<xliff:g id="separator">=</xliff:g>Curaçao<xliff:g id="timezone">|America/Curacao</xliff:g></string>
+ <string name="C43">D<xliff:g id="separator">=</xliff:g>Dawson Creek<xliff:g id="timezone">|America/Dawson_Creek</xliff:g></string>
+ <string name="C44">D<xliff:g id="separator">=</xliff:g>Denver<xliff:g id="timezone">|America/Denver</xliff:g></string>
+ <string name="C45">D<xliff:g id="separator">=</xliff:g>Detroit<xliff:g id="timezone">|America/Detroit</xliff:g></string>
+ <string name="C46">D<xliff:g id="separator">=</xliff:g>Dominica<xliff:g id="timezone">|America/Dominica</xliff:g></string>
+ <string name="C47">E<xliff:g id="separator">=</xliff:g>Edmonton<xliff:g id="timezone">|America/Edmonton</xliff:g></string>
+ <string name="C48">E<xliff:g id="separator">=</xliff:g>El Salvador<xliff:g id="timezone">|America/El_Salvador</xliff:g></string>
+ <string name="C49">F<xliff:g id="separator">=</xliff:g>Fortaleza<xliff:g id="timezone">|America/Fortaleza</xliff:g></string>
+ <string name="C50">G<xliff:g id="separator">=</xliff:g>Grand Turk<xliff:g id="timezone">|America/Grand_Turk</xliff:g></string>
+ <string name="C51">G<xliff:g id="separator">=</xliff:g>Grenada<xliff:g id="timezone">|America/Grenada</xliff:g></string>
+ <string name="C52">D<xliff:g id="separator">=</xliff:g>Dinas Gwatemala<xliff:g id="timezone">|America/Gwatemala</xliff:g></string>
+ <string name="C53">G<xliff:g id="separator">=</xliff:g>Guyana<xliff:g id="timezone">|America/Guyana</xliff:g></string>
+ <string name="C54">H<xliff:g id="separator">=</xliff:g>Halifax<xliff:g id="timezone">|America/Halifax</xliff:g></string>
+ <string name="C55">H<xliff:g id="separator">=</xliff:g>Havana<xliff:g id="timezone">|America/Havana</xliff:g></string>
+ <string name="C56">I<xliff:g id="separator">=</xliff:g>Indianapolis<xliff:g id="timezone">|America/Indiana/Indianapolis</xliff:g></string>
+ <string name="C57">K<xliff:g id="separator">=</xliff:g>Knox<xliff:g id="timezone">|America/Indiana/Knox</xliff:g></string>
+ <string name="C58">M<xliff:g id="separator">=</xliff:g>Marengo<xliff:g id="timezone">|America/Indiana/Marengo</xliff:g></string>
+ <string name="C59">P<xliff:g id="separator">=</xliff:g>Petersburg<xliff:g id="timezone">|America/Indiana/Petersburg</xliff:g></string>
+ <string name="C60">T<xliff:g id="separator">=</xliff:g>Tell City<xliff:g id="timezone">|America/Indiana/Tell_City</xliff:g></string>
+ <string name="C61">V<xliff:g id="separator">=</xliff:g>Vevay<xliff:g id="timezone">|America/Indiana/Vevay</xliff:g></string>
+ <string name="C62">V<xliff:g id="separator">=</xliff:g>Vincennes<xliff:g id="timezone">|America/Indiana/Vincennes</xliff:g></string>
+ <string name="C63">W<xliff:g id="separator">=</xliff:g>Winamac<xliff:g id="timezone">|America/Indiana/Winamac</xliff:g></string>
+ <string name="C64">K<xliff:g id="separator">=</xliff:g>Kingston<xliff:g id="timezone">|America/Jamaica</xliff:g></string>
+ <string name="C65">N<xliff:g id="separator">=</xliff:g>Nuestra Señora de La Paz<xliff:g id="timezone">|America/La_Paz</xliff:g></string>
+ <string name="C66">L<xliff:g id="separator">=</xliff:g>Lima<xliff:g id="timezone">|America/Lima</xliff:g></string>
+ <string name="C67">L<xliff:g id="separator">=</xliff:g>Los Angeles<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C68">L<xliff:g id="separator">=</xliff:g>Louisville<xliff:g id="timezone">|America/Louisville</xliff:g></string>
+ <string name="C69">M<xliff:g id="separator">=</xliff:g>Managua<xliff:g id="timezone">|America/Managua</xliff:g></string>
+ <string name="C70">M<xliff:g id="separator">=</xliff:g>Martinique<xliff:g id="timezone">|America/Martinique</xliff:g></string>
+ <string name="C71">M<xliff:g id="separator">=</xliff:g>Mendoza<xliff:g id="timezone">|America/Mendoza</xliff:g></string>
+ <string name="C72">M<xliff:g id="separator">=</xliff:g>Metlakatla<xliff:g id="timezone">|America/Metlakatla</xliff:g></string>
+ <string name="C73">D<xliff:g id="separator">=</xliff:g>Dinas Mecsico<xliff:g id="timezone">|America/Dinas Mecsico</xliff:g></string>
+ <string name="C74">M<xliff:g id="separator">=</xliff:g>Monterrey<xliff:g id="timezone">|America/Monterrey</xliff:g></string>
+ <string name="C75">M<xliff:g id="separator">=</xliff:g>Montevideo<xliff:g id="timezone">|America/Montevideo</xliff:g></string>
+ <string name="C76">M<xliff:g id="separator">=</xliff:g>Montreal<xliff:g id="timezone">|America/Montreal</xliff:g></string>
+ <string name="C77">N<xliff:g id="separator">=</xliff:g>Nassau<xliff:g id="timezone">|America/Nassau</xliff:g></string>
+ <string name="C78">E<xliff:g id="separator">=</xliff:g>Efrog Newydd<xliff:g id="timezone">|America/Efrog_Newydd</xliff:g></string>
+ <string name="C79">B<xliff:g id="separator">=</xliff:g>Beulah<xliff:g id="timezone">|America/Gogledd_Dakota/Beulah</xliff:g></string>
+ <string name="C80">C<xliff:g id="separator">=</xliff:g>Center<xliff:g id="timezone">|America/Gogledd_Dakota/Center</xliff:g></string>
+ <string name="C81">N<xliff:g id="separator">=</xliff:g>New Salem<xliff:g id="timezone">|America/Gogledd_Dakota/New_Salem</xliff:g></string>
+ <string name="C82">P<xliff:g id="separator">=</xliff:g>Panama<xliff:g id="timezone">|America/Panama</xliff:g></string>
+ <string name="C83">P<xliff:g id="separator">=</xliff:g>Phoenix<xliff:g id="timezone">|America/Phoenix</xliff:g></string>
+ <string name="C84">P<xliff:g id="separator">=</xliff:g>Port of Spain<xliff:g id="timezone">|America/Port_of_Spain</xliff:g></string>
+ <string name="C85">P<xliff:g id="separator">=</xliff:g>Port-au-Prince<xliff:g id="timezone">|America/Port-au-Prince</xliff:g></string>
+ <string name="C86">P<xliff:g id="separator">=</xliff:g>Puerto Rico<xliff:g id="timezone">|America/Puerto_Rico</xliff:g></string>
+ <string name="C87">S<xliff:g id="separator">=</xliff:g>Santo Domingo<xliff:g id="timezone">|America/Santo_Domingo</xliff:g></string>
+ <string name="C88">S<xliff:g id="separator">=</xliff:g>São Paulo<xliff:g id="timezone">|America/Sao_Paulo</xliff:g></string>
+ <string name="C89">S<xliff:g id="separator">=</xliff:g>St. Johns<xliff:g id="timezone">|America/St_Johns</xliff:g></string>
+ <string name="C90">S<xliff:g id="separator">=</xliff:g>St. Kitts<xliff:g id="timezone">|America/St_Kitts</xliff:g></string>
+ <string name="C91">S<xliff:g id="separator">=</xliff:g>St. Lucia<xliff:g id="timezone">|America/St_Lucia</xliff:g></string>
+ <string name="C92">S<xliff:g id="separator">=</xliff:g>St. Thomas<xliff:g id="timezone">|America/St_Thomas</xliff:g></string>
+ <string name="C93">T<xliff:g id="separator">=</xliff:g>Tijuana<xliff:g id="timezone">|America/Tijuana</xliff:g></string>
+ <string name="C94">T<xliff:g id="separator">=</xliff:g>Toronto<xliff:g id="timezone">|America/Toronto</xliff:g></string>
+ <string name="C95">V<xliff:g id="separator">=</xliff:g>Vancouver<xliff:g id="timezone">|America/Vancouver</xliff:g></string>
+ <string name="C96">W<xliff:g id="separator">=</xliff:g>Winnipeg<xliff:g id="timezone">|America/Winnipeg</xliff:g></string>
+ <string name="C97">P<xliff:g id="separator">=</xliff:g>Pegwn y De<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Antarctica/South_Pole</xliff:g></string>
+ <string name="C98">L<xliff:g id="separator">=</xliff:g>Longyearbyen<xliff:g id="timezone">|Arctic/Longyearbyen</xliff:g></string>
+ <string name="C99">A<xliff:g id="separator">=</xliff:g>Almaty<xliff:g id="timezone">|Asia/Almaty</xliff:g></string>
+ <string name="C100">A<xliff:g id="separator">=</xliff:g>Amman<xliff:g id="timezone">|Asia/Amman</xliff:g></string>
+ <string name="C101">A<xliff:g id="separator">=</xliff:g>Anadyr<xliff:g id="timezone">|Asia/Anadyr</xliff:g></string>
+ <string name="C102">A<xliff:g id="separator">=</xliff:g>Aqtau<xliff:g id="timezone">|Asia/Aqtau</xliff:g></string>
+ <string name="C103">B<xliff:g id="separator">=</xliff:g>Baghdad<xliff:g id="timezone">|Asia/Baghdad</xliff:g></string>
+ <string name="C104">B<xliff:g id="separator">=</xliff:g>Bahrain<xliff:g id="timezone">|Asia/Bahrain</xliff:g></string>
+ <string name="C105">B<xliff:g id="separator">=</xliff:g>Baku<xliff:g id="timezone">|Asia/Baku</xliff:g></string>
+ <string name="C106">B<xliff:g id="separator">=</xliff:g>Bangkok<xliff:g id="timezone">|Asia/Bangkok</xliff:g></string>
+ <string name="C107">B<xliff:g id="separator">=</xliff:g>Beirut<xliff:g id="timezone">|Asia/Beirut</xliff:g></string>
+ <string name="C108">K<xliff:g id="separator">=</xliff:g>Kolkata<xliff:g id="timezone">|Asia/Calcutta</xliff:g></string>
+ <string name="C109">D<xliff:g id="separator">=</xliff:g>Damascus<xliff:g id="timezone">|Asia/Damascus</xliff:g></string>
+ <string name="C110">D<xliff:g id="separator">=</xliff:g>Dhaka<xliff:g id="timezone">|Asia/Dhaka</xliff:g></string>
+ <string name="C111">D<xliff:g id="separator">=</xliff:g>Dubai<xliff:g id="timezone">|Asia/Dubai</xliff:g></string>
+ <string name="C112">G<xliff:g id="separator">=</xliff:g>Gaza<xliff:g id="timezone">|Asia/Gaza</xliff:g></string>
+ <string name="C113">H<xliff:g id="separator">=</xliff:g>Hebron<xliff:g id="timezone">|Asia/Hebron</xliff:g></string>
+ <string name="C114">H<xliff:g id="separator">=</xliff:g>Ho Chi Minh<xliff:g id="timezone">|Asia/Ho_Chi_Minh</xliff:g></string>
+ <string name="C115">H<xliff:g id="separator">=</xliff:g>Hong Cong<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Asia/Hong_Cong</xliff:g></string>
+ <string name="C117">J<xliff:g id="separator">=</xliff:g>Jakarta<xliff:g id="timezone">|Asia/Jakarta</xliff:g></string>
+ <string name="C118">J<xliff:g id="separator">=</xliff:g>Jeriwsalem<xliff:g id="timezone">|Asia/Jeriwsalem</xliff:g></string>
+ <string name="C119">K<xliff:g id="separator">=</xliff:g>Kabul<xliff:g id="timezone">|Asia/Kabul</xliff:g></string>
+ <string name="C120">K<xliff:g id="separator">=</xliff:g>Karachi<xliff:g id="timezone">|Asia/Karachi</xliff:g></string>
+ <string name="C121">K<xliff:g id="separator">=</xliff:g>Kathmandu<xliff:g id="timezone">|Asia/Kathmandu</xliff:g></string>
+ <string name="C122">K<xliff:g id="separator">=</xliff:g>Kuala Lumpur<xliff:g id="timezone">|Asia/Kuala_Lumpur</xliff:g></string>
+ <string name="C123">C<xliff:g id="separator">=</xliff:g>Coweit<xliff:g id="timezone">|Asia/Coweit</xliff:g></string>
+ <string name="C124">M<xliff:g id="separator">=</xliff:g>Macau<xliff:g id="timezone">|Asia/Macau</xliff:g></string>
+ <string name="C125">M<xliff:g id="separator">=</xliff:g>Manila<xliff:g id="timezone">|Asia/Manila</xliff:g></string>
+ <string name="C126">M<xliff:g id="separator">=</xliff:g>Muscat<xliff:g id="timezone">|Asia/Muscat</xliff:g></string>
+ <string name="C127">P<xliff:g id="separator">=</xliff:g>Phnom Penh<xliff:g id="timezone">|Asia/Phnom_Penh</xliff:g></string>
+ <string name="C128">P<xliff:g id="separator">=</xliff:g>Pyongyang<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Asia/Pyongyang</xliff:g></string>
+ <string name="C130">R<xliff:g id="separator">=</xliff:g>Rangoon<xliff:g id="timezone">|Asia/Rangoon</xliff:g></string>
+ <string name="C131">R<xliff:g id="separator">=</xliff:g>Riyadh<xliff:g id="timezone">|Asia/Riyadh</xliff:g></string>
+ <string name="C133">S<xliff:g id="separator">=</xliff:g>Seoul<xliff:g id="timezone">|Asia/Seoul</xliff:g></string>
+ <string name="C134">S<xliff:g id="separator">=</xliff:g>Shanghai<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Asia/Shanghai</xliff:g></string>
+ <string name="C135">S<xliff:g id="separator">=</xliff:g>Singapore<xliff:g id="timezone">|Asia/Singapore</xliff:g></string>
+ <string name="C136">T<xliff:g id="separator">=</xliff:g>Taipei<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Asia/Taipei</xliff:g></string>
+ <string name="C137">T<xliff:g id="separator">=</xliff:g>Tehran<xliff:g id="timezone">|Asia/Tehran</xliff:g></string>
+ <string name="C138">T<xliff:g id="separator">=</xliff:g>Tel Aviv<xliff:g id="timezone">|Asia/Tel_Aviv</xliff:g></string>
+ <string name="C139">T<xliff:g id="separator">=</xliff:g>Tokyo<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Asia/Tokyo</xliff:g></string>
+ <string name="C140">U<xliff:g id="separator">=</xliff:g>Ulaanbaatar<xliff:g id="timezone">|Asia/Ulaanbaatar</xliff:g></string>
+ <string name="C141">B<xliff:g id="separator">=</xliff:g>Bermuda<xliff:g id="timezone">|Cefnfor_yr_Iwerydd/Bermuda</xliff:g></string>
+ <string name="C142">C<xliff:g id="separator">=</xliff:g>Canary<xliff:g id="timezone">|Cefnfor_yr_Iwerydd/Canary</xliff:g></string>
+ <string name="C143">P<xliff:g id="separator">=</xliff:g>Penrhyn Verde<xliff:g id="timezone">|Cefnfor_yr_Iwerydd/Penrhyn_Verde</xliff:g></string>
+ <string name="C144">R<xliff:g id="separator">=</xliff:g>Reykjavik<xliff:g id="timezone">|Cefnfor_yr_Iwerydd/Reykjavik</xliff:g></string>
+ <string name="C145">S<xliff:g id="separator">=</xliff:g>Stanley<xliff:g id="timezone">|Cefnfor_yr_Iwerydd/Stanley</xliff:g></string>
+ <string name="C146">A<xliff:g id="separator">=</xliff:g>Adelaide<xliff:g id="timezone">|Awstralia/Adelaide</xliff:g></string>
+ <string name="C147">B<xliff:g id="separator">=</xliff:g>Brisbane<xliff:g id="timezone">|Awstralia/Brisbane</xliff:g></string>
+ <string name="C148">C<xliff:g id="separator">=</xliff:g>Canberra<xliff:g id="timezone">|Awstralia/Canberra</xliff:g></string>
+ <string name="C149">D<xliff:g id="separator">=</xliff:g>Darwin<xliff:g id="timezone">|Awstralia/Darwin</xliff:g></string>
+ <string name="C150">M<xliff:g id="separator">=</xliff:g>Melbourne<xliff:g id="timezone">|Awstralia/Melbourne</xliff:g></string>
+ <string name="C151">D<xliff:g id="separator">=</xliff:g>De Cymru Newydd<xliff:g id="timezone">|Awstralia/DCM</xliff:g></string>
+ <string name="C152">P<xliff:g id="separator">=</xliff:g>Perth<xliff:g id="timezone">|Awstralia/Perth</xliff:g></string>
+ <string name="C153">Q<xliff:g id="separator">=</xliff:g>Queensland<xliff:g id="timezone">|Awstralia/Queensland</xliff:g></string>
+ <string name="C154">S<xliff:g id="separator">=</xliff:g>Sydney<xliff:g id="timezone">|Awstralia/Sydney</xliff:g></string>
+ <string name="C155">V<xliff:g id="separator">=</xliff:g>Victoria<xliff:g id="timezone">|Awstralia/Victoria</xliff:g></string>
+ <string name="C156">T<xliff:g id="separator">=</xliff:g>Y Tir Newydd<xliff:g id="timezone">|Canada/Y Tir Newydd</xliff:g></string>
+ <string name="C157">S<xliff:g id="separator">=</xliff:g>Saskatchewan<xliff:g id="timezone">|Canada/Saskatchewan</xliff:g></string>
+ <string name="C158">Y<xliff:g id="separator">=</xliff:g>Ynys y Pasg<xliff:g id="timezone">|Tsile/YnysYPasg</xliff:g></string>
+ <string name="C159">A<xliff:g id="separator">=</xliff:g>Amsterdam<xliff:g id="timezone">|Ewrop/Amsterdam</xliff:g></string>
+ <string name="C160">A<xliff:g id="separator">=</xliff:g>Andorra<xliff:g id="timezone">|Ewrop/Andorra</xliff:g></string>
+ <string name="C161">A<xliff:g id="separator">=</xliff:g>Athen<xliff:g id="timezone">|Ewrop/Athen</xliff:g></string>
+ <string name="C162">B<xliff:g id="separator">=</xliff:g>Belffast<xliff:g id="timezone">|Ewrop/Belffast</xliff:g></string>
+ <string name="C163">B<xliff:g id="separator">=</xliff:g>Beograd<xliff:g id="timezone">|Ewrop/Beograd</xliff:g></string>
+ <string name="C164">B<xliff:g id="separator">=</xliff:g>Berlin<xliff:g id="timezone">|Ewrop/Berlin</xliff:g></string>
+ <string name="C165">B<xliff:g id="separator">=</xliff:g>Bratislava<xliff:g id="timezone">|Ewrop/Bratislava</xliff:g></string>
+ <string name="C166">B<xliff:g id="separator">=</xliff:g>Brwsel<xliff:g id="timezone">|Ewrop/Brwsel</xliff:g></string>
+ <string name="C167">B<xliff:g id="separator">=</xliff:g>Bwcharest<xliff:g id="timezone">|Ewrop/Bwcharest</xliff:g></string>
+ <string name="C168">B<xliff:g id="separator">=</xliff:g>Bwdapest<xliff:g id="timezone">|Ewrop/Bwdapest</xliff:g></string>
+ <string name="C169">C<xliff:g id="separator">=</xliff:g>Chisinau<xliff:g id="timezone">|Ewrop/Chisinau</xliff:g></string>
+ <string name="C170">C<xliff:g id="separator">=</xliff:g>Copenhagen<xliff:g id="timezone">|Ewrop/Copenhagen</xliff:g></string>
+ <string name="C171">D<xliff:g id="separator">=</xliff:g>Dulyn<xliff:g id="timezone">|Ewrop/Dublin</xliff:g></string>
+ <string name="C172">G<xliff:g id="separator">=</xliff:g>Gibraltar<xliff:g id="timezone">|Ewrop/Gibraltar</xliff:g></string>
+ <string name="C173">H<xliff:g id="separator">=</xliff:g>Helsinki<xliff:g id="timezone">|Ewrop/Helsinki</xliff:g></string>
+ <string name="C174">I<xliff:g id="separator">=</xliff:g>Ynys Manaw<xliff:g id="timezone">|Ewrop/Ynys_Manaw</xliff:g></string>
+ <string name="C175">I<xliff:g id="separator">=</xliff:g>Istanbul<xliff:g id="timezone">|Ewrop/Istanbul</xliff:g></string>
+ <string name="C176">K<xliff:g id="separator">=</xliff:g>Kiev<xliff:g id="timezone">|Ewrop/Kiev</xliff:g></string>
+ <string name="C177">L<xliff:g id="separator">=</xliff:g>Lisbon<xliff:g id="timezone">|Ewrop/Lisbon</xliff:g></string>
+ <string name="C178">Ll<xliff:g id="separator">=</xliff:g>Llundain<xliff:g id="timezone">|Ewrop/Llundain</xliff:g></string>
+ <string name="C179">L<xliff:g id="separator">=</xliff:g>Lwcsembwrg<xliff:g id="timezone">|Ewrop/Lwcsembwrg</xliff:g></string>
+ <string name="C180">M<xliff:g id="separator">=</xliff:g>Madrid<xliff:g id="timezone">|Ewrop/Madrid</xliff:g></string>
+ <string name="C181">M<xliff:g id="separator">=</xliff:g>Malta<xliff:g id="timezone">|Ewrop/Malta</xliff:g></string>
+ <string name="C182">M<xliff:g id="separator">=</xliff:g>Minsk<xliff:g id="timezone">|Ewrop/Minsk</xliff:g></string>
+ <string name="C183">M<xliff:g id="separator">=</xliff:g>Monaco<xliff:g id="timezone">|Ewrop/Monaco</xliff:g></string>
+ <string name="C184">M<xliff:g id="separator">=</xliff:g>Moscfa<xliff:g id="timezone">|Ewrop/Moscfa</xliff:g></string>
+ <string name="C185">O<xliff:g id="separator">=</xliff:g>Oslo<xliff:g id="timezone">|Ewrop/Oslo</xliff:g></string>
+ <string name="C186">P<xliff:g id="separator">=</xliff:g>Paris<xliff:g id="timezone">|Ewrop/Paris</xliff:g></string>
+ <string name="C187">P<xliff:g id="separator">=</xliff:g>Prag<xliff:g id="timezone">|Ewrop/Prag</xliff:g></string>
+ <string name="C188">R<xliff:g id="separator">=</xliff:g>Riga<xliff:g id="timezone">|Ewrop/Riga</xliff:g></string>
+ <string name="C189">Rh<xliff:g id="separator">=</xliff:g>Rhufain<xliff:g id="timezone">|Ewrop/Rhufain</xliff:g></string>
+ <string name="C190">S<xliff:g id="separator">=</xliff:g>San Marino<xliff:g id="timezone">|Ewrop/San_Marino</xliff:g></string>
+ <string name="C191">S<xliff:g id="separator">=</xliff:g>Sarajevo<xliff:g id="timezone">|Ewrop/Sarajevo</xliff:g></string>
+ <string name="C192">S<xliff:g id="separator">=</xliff:g>Simferopol<xliff:g id="timezone">|Ewrop/Simferopol</xliff:g></string>
+ <string name="C193">S<xliff:g id="separator">=</xliff:g>Skopje<xliff:g id="timezone">|Ewrop/Skopje</xliff:g></string>
+ <string name="C194">S<xliff:g id="separator">=</xliff:g>Sofia<xliff:g id="timezone">|Ewrop/Sofia</xliff:g></string>
+ <string name="C195">S<xliff:g id="separator">=</xliff:g>Stockholm<xliff:g id="timezone">|Ewrop/Stockholm</xliff:g></string>
+ <string name="C196">T<xliff:g id="separator">=</xliff:g>Tallinn<xliff:g id="timezone">|Ewrop/Tallinn</xliff:g></string>
+ <string name="C197">F<xliff:g id="separator">=</xliff:g>Y Fatican<xliff:g id="timezone">|Ewrop/Y_Fatican</xliff:g></string>
+ <string name="C198">F<xliff:g id="separator">=</xliff:g>Fienna<xliff:g id="timezone">|Ewrop/Fienna</xliff:g></string>
+ <string name="C199">V<xliff:g id="separator">=</xliff:g>Vilnius<xliff:g id="timezone">|Ewrop/Vilnius</xliff:g></string>
+ <string name="C200">W<xliff:g id="separator">=</xliff:g>Warsaw<xliff:g id="timezone">|Ewrop/Warsaw</xliff:g></string>
+ <string name="C201">Z<xliff:g id="separator">=</xliff:g>Zagreb<xliff:g id="timezone">|Ewrop/Zagreb</xliff:g></string>
+ <string name="C202">Z<xliff:g id="separator">=</xliff:g>Zürich<xliff:g id="timezone">|Ewrop/Zurich</xliff:g></string>
+ <string name="C203">A<xliff:g id="separator">=</xliff:g>Antananarivo<xliff:g id="timezone">|Cefnfor_India/Antananarivo</xliff:g></string>
+ <string name="C204">M<xliff:g id="separator">=</xliff:g>Maldives<xliff:g id="timezone">|Cefnfor_India/Maldives</xliff:g></string>
+ <string name="C205">M<xliff:g id="separator">=</xliff:g>Mauritius<xliff:g id="timezone">|Cefnfor_India/Mauritius</xliff:g></string>
+ <string name="C206">A<xliff:g id="separator">=</xliff:g>Auckland<xliff:g id="timezone">|Cefnfor_Tawel/Auckland</xliff:g></string>
+ <string name="C207">Ff<xliff:g id="separator">=</xliff:g>Fiji<xliff:g id="timezone">|Cefnfor_Tawel/Ffiji</xliff:g></string>
+ <string name="C208">G<xliff:g id="separator">=</xliff:g>Gwam<xliff:g id="timezone">|Cefnfor_Tawel/Gwam</xliff:g></string>
+ <string name="C209">H<xliff:g id="separator">=</xliff:g>Honolulu<xliff:g id="timezone">|Cefnfor_Tawel/Honolulu</xliff:g></string>
+ <string name="C210">K<xliff:g id="separator">=</xliff:g>Kiritimati<xliff:g id="timezone">|Cefnfor_Tawel/Kiritimati</xliff:g></string>
+ <string name="C211">N<xliff:g id="separator">=</xliff:g>Noumea<xliff:g id="timezone">|Cefnfor_Tawel/Noumea</xliff:g></string>
+ <string name="C214">A<xliff:g id="separator">=</xliff:g>Antigua<xliff:g id="timezone">|America/Antigua</xliff:g></string>
+ <string name="C215">A<xliff:g id="separator">=</xliff:g>Austin<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C216">B<xliff:g id="separator">=</xliff:g>Boston<xliff:g id="timezone">|America/Efrog_Newydd</xliff:g></string>
+ <string name="C217">C<xliff:g id="separator">=</xliff:g>Calgary<xliff:g id="timezone">|America/Denver</xliff:g></string>
+ <string name="C218">C<xliff:g id="separator">=</xliff:g>Columbus<xliff:g id="timezone">|America/Efrog_Newydd</xliff:g></string>
+ <string name="C219">D<xliff:g id="separator">=</xliff:g>Dallas<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C220">K<xliff:g id="separator">=</xliff:g>Knoxville<xliff:g id="timezone">|America/Efrog_Newydd</xliff:g></string>
+ <string name="C221">M<xliff:g id="separator">=</xliff:g>Memphis<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C222">M<xliff:g id="separator">=</xliff:g>Miami<xliff:g id="timezone">|America/Efrog_Newydd</xliff:g></string>
+ <string name="C223">M<xliff:g id="separator">=</xliff:g>Minneapolis<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C224">O<xliff:g id="separator">=</xliff:g>Ottawa<xliff:g id="timezone">|America/Efrog_Newydd</xliff:g></string>
+ <string name="C225">P<xliff:g id="separator">=</xliff:g>Philadelphia<xliff:g id="timezone">|America/Efrog_Newydd</xliff:g></string>
+ <string name="C226">P<xliff:g id="separator">=</xliff:g>Portland<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C227">S<xliff:g id="separator">=</xliff:g>San Diego<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C228">S<xliff:g id="separator">=</xliff:g>San Francisco<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C229">S<xliff:g id="separator">=</xliff:g>Salt Lake City<xliff:g id="timezone">|America/Denver</xliff:g></string>
+ <string name="C230">S<xliff:g id="separator">=</xliff:g>San Jose<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C231">S<xliff:g id="separator">=</xliff:g>San Salvador<xliff:g id="timezone">|America/Guatemala</xliff:g></string>
+ <string name="C232">S<xliff:g id="separator">=</xliff:g>Seattle<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C233">S<xliff:g id="separator">=</xliff:g>St. Louis<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C234">W<xliff:g id="separator">=</xliff:g>Washington D.C.<xliff:g id="timezone">|America/Efrog_Newydd</xliff:g></string>
+ <string name="C235">H<xliff:g id="separator">=</xliff:g>Houston<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C236">S<xliff:g id="separator">=</xliff:g>San Antonio<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C237">J<xliff:g id="separator">=</xliff:g>Jacksonville<xliff:g id="timezone">|America/Efrog_Newydd</xliff:g></string>
+ <string name="C238">B<xliff:g id="separator">=</xliff:g>Baltimore<xliff:g id="timezone">|America/Efrog_Newydd</xliff:g></string>
+ <string name="C239">N<xliff:g id="separator">=</xliff:g>Nashville<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C240">M<xliff:g id="separator">=</xliff:g>Milwaukee<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C241">D<xliff:g id="separator">=</xliff:g>Dinas Oklahoma<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C242">L<xliff:g id="separator">=</xliff:g>Las Vegas<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C243">A<xliff:g id="separator">=</xliff:g>Albuquerque<xliff:g id="timezone">|America/Denver</xliff:g></string>
+ <string name="C244">T<xliff:g id="separator">=</xliff:g>Tucson<xliff:g id="timezone">|MST</xliff:g></string>
+ <string name="C245">S<xliff:g id="separator">=</xliff:g>Sacramento<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C246">A<xliff:g id="separator">=</xliff:g>Atlanta<xliff:g id="timezone">|America/Efrog_Newydd</xliff:g></string>
+ <string name="C247">C<xliff:g id="separator">=</xliff:g>Cleveland<xliff:g id="timezone">|America/Efrog_Newydd</xliff:g></string>
+ <string name="C248">N<xliff:g id="separator">=</xliff:g>New Orleans<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C249">T<xliff:g id="separator">=</xliff:g>Tampa<xliff:g id="timezone">|America/Efrog_Newydd</xliff:g></string>
+ <string name="C250">P<xliff:g id="separator">=</xliff:g>Pittsburgh<xliff:g id="timezone">|America/Efrog_Newydd</xliff:g></string>
+ <string name="C251">C<xliff:g id="separator">=</xliff:g>Cincinnati<xliff:g id="timezone">|America/Efrog_Newydd</xliff:g></string>
+ <string name="C252">M<xliff:g id="separator">=</xliff:g>Mountain View<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C253">R<xliff:g id="separator">=</xliff:g>Reno<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C254">B<xliff:g id="separator">=</xliff:g>Black Rock City<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C255">D<xliff:g id="separator">=</xliff:g>Doha<xliff:g id="timezone">|Asia/Riyadh</xliff:g></string>
+ <string name="C256">B<xliff:g id="separator">=</xliff:g>Beijing<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Asia/Shanghai</xliff:g></string>
+ <string name="C257">M<xliff:g id="separator">=</xliff:g>Mumbai<xliff:g id="timezone">|Asia/Kolkata</xliff:g></string>
+ <string name="C258">D<xliff:g id="separator">=</xliff:g>Delhi<xliff:g id="timezone">|Asia/Kolkata</xliff:g></string>
+ <string name="C259">O<xliff:g id="separator">=</xliff:g>Osaka<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Asia/Tokyo</xliff:g></string>
+ <string name="C260">L<xliff:g id="separator">=</xliff:g>Lahore<xliff:g id="timezone">|Asia/Karachi</xliff:g></string>
+ <string name="C261">S<xliff:g id="separator">=</xliff:g>Sana\'a<xliff:g id="timezone">|Asia/Riyadh</xliff:g></string>
+ <string name="C262">B<xliff:g id="separator">=</xliff:g>Barcelona<xliff:g id="timezone">|Ewrop/Madrid</xliff:g></string>
+ <string name="C263">M<xliff:g id="separator">=</xliff:g>Munich<xliff:g id="timezone">|Ewrop/Berlin</xliff:g></string>
+ <string name="C264">M<xliff:g id="separator">=</xliff:g>Milan<xliff:g id="timezone">|Ewrop/Rome</xliff:g></string>
+ <string name="C265">F<xliff:g id="separator">=</xliff:g>Frankfurt<xliff:g id="timezone">|Ewrop/Berlin</xliff:g></string>
+ <string name="C266">H<xliff:g id="separator">=</xliff:g>Hanoi<xliff:g id="timezone">|Asia/Bangkok</xliff:g></string>
+ <string name="C267">A<xliff:g id="separator">=</xliff:g>Ankara<xliff:g id="timezone">|Ewrop/Istanbul</xliff:g></string>
+ <string name="C268">B<xliff:g id="separator">=</xliff:g>Bangalore<xliff:g id="timezone">|Asia/Kolkata</xliff:g></string>
+ <string name="C269">B<xliff:g id="separator">=</xliff:g>Brasília<xliff:g id="timezone">|America/Sao_Paulo</xliff:g></string>
+ <string name="C270">T<xliff:g id="separator">=</xliff:g>Tref y Penrhyn<xliff:g id="timezone">|Affrica/Johannesburg</xliff:g></string>
+ <string name="C271">I<xliff:g id="separator">=</xliff:g>Islamabad<xliff:g id="timezone">|Asia/Karachi</xliff:g></string>
+ <string name="C272">R<xliff:g id="separator">=</xliff:g>Rio de Janeiro<xliff:g id="timezone">|America/Sao_Paulo</xliff:g></string>
+ <string name="C273">A<xliff:g id="separator">=</xliff:g>Ann Arbor<xliff:g id="timezone">|America/Detroit</xliff:g></string>
+ <string name="C274">B<xliff:g id="separator">=</xliff:g>Boulder<xliff:g id="timezone">|America/Denver</xliff:g></string>
+ <string name="C275">C<xliff:g id="separator">=</xliff:g>Cambridge<xliff:g id="timezone">|America/Efrog_Newydd</xliff:g></string>
+ <string name="C276">K<xliff:g id="separator">=</xliff:g>Kirkland<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C277">M<xliff:g id="separator">=</xliff:g>Madison<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C278">G<xliff:g id="separator">=</xliff:g>Guangzhou<xliff:g id="phonetic">:</xliff:g><xliff:g id="timezone">|Asia/Shanghai</xliff:g></string>
+ <string name="C279">H<xliff:g id="separator">=</xliff:g>Hyderabad<xliff:g id="timezone">|Asia/Kolkata</xliff:g></string>
+ <string name="C280">R<xliff:g id="separator">=</xliff:g>Reston<xliff:g id="timezone">|America/Efrog_Newydd</xliff:g></string>
+ <string name="C281">B<xliff:g id="separator">=</xliff:g>Belo Horizonte<xliff:g id="timezone">|America/Sao_Paulo</xliff:g></string>
+ <string name="C282">S<xliff:g id="separator">=</xliff:g>Santiago<xliff:g id="timezone">|America/Santiago</xliff:g></string>
+ <string name="C283">M<xliff:g id="separator">=</xliff:g>Monrovia<xliff:g id="timezone">|Affrica/Monrovia</xliff:g></string>
+ <string name="C284">C<xliff:g id="separator">=</xliff:g>Colombo<xliff:g id="timezone">|Asia/Colombo</xliff:g></string>
+ <string name="C285">C<xliff:g id="separator">=</xliff:g>Chihuahua<xliff:g id="timezone">|America/Chihuahua</xliff:g></string>
+ <string name="C286">S<xliff:g id="separator">=</xliff:g>Salvador<xliff:g id="timezone">|America/Sao_Paulo</xliff:g></string>
+ <string name="C287">G<xliff:g id="separator">=</xliff:g>Gurgaon<xliff:g id="timezone">|Asia/Kolkata</xliff:g></string>
+ <string name="C288">C<xliff:g id="separator">=</xliff:g>Caerdydd<xliff:g id="timezone">|Ewrop/Llundain</xliff:g></string>
+ <string name="C290">S<xliff:g id="separator">=</xliff:g>St. Petersburg<xliff:g id="timezone">|Ewrop/Moscow</xliff:g></string>
+ <string name="C291">K<xliff:g id="separator">=</xliff:g>Kraków<xliff:g id="timezone">|Ewrop/Warsaw</xliff:g></string>
+ <string name="C292">W<xliff:g id="separator">=</xliff:g>Wroclaw<xliff:g id="timezone">|Ewrop/Warsaw</xliff:g></string>
+ <string name="C293">H<xliff:g id="separator">=</xliff:g>Hamburg<xliff:g id="timezone">|Ewrop/Berlin</xliff:g></string>
+ <string name="C294">O<xliff:g id="separator">=</xliff:g>Oulu<xliff:g id="timezone">|Ewrop/Bucharest</xliff:g></string>
+ <string name="C295">H<xliff:g id="separator">=</xliff:g>Haifa<xliff:g id="timezone">|Asia/Jerusalem</xliff:g></string>
+ <string name="C296">S<xliff:g id="separator">=</xliff:g>San Juan<xliff:g id="timezone">|America/Puerto_Rico</xliff:g></string>
+ <string name="C297">T<xliff:g id="separator">=</xliff:g>Tegucigalpa<xliff:g id="timezone">|America/Tegucigalpa</xliff:g></string>
+ <string name="C298">P<xliff:g id="separator">=</xliff:g>Paramaribo<xliff:g id="timezone">|America/Paramaribo</xliff:g></string>
+ <string name="C299">Q<xliff:g id="separator">=</xliff:g>Quito<xliff:g id="timezone">|America/Panama</xliff:g></string>
+ <string name="C300">L<xliff:g id="separator">=</xliff:g>Ljubljana<xliff:g id="timezone">|Ewrop/Ljubljana</xliff:g></string>
+ <string name="C301">A<xliff:g id="separator">=</xliff:g>Ashgabat<xliff:g id="timezone">|Asia/Ashgabat</xliff:g></string>
+ <string name="C302">A<xliff:g id="separator">=</xliff:g>Asmara<xliff:g id="timezone">|Affrica/Asmara</xliff:g></string>
+ <string name="C303">B<xliff:g id="separator">=</xliff:g>Bandar Seri Begawan<xliff:g id="timezone">|Asia/Brunei</xliff:g></string>
+ <string name="C304">B<xliff:g id="separator">=</xliff:g>Bangui<xliff:g id="timezone">|Affrica/Bangui</xliff:g></string>
+ <string name="C305">B<xliff:g id="separator">=</xliff:g>Banjul<xliff:g id="timezone">|Affrica/Banjul</xliff:g></string>
+ <string name="C306">B<xliff:g id="separator">=</xliff:g>Bishkek<xliff:g id="timezone">|Asia/Bishkek</xliff:g></string>
+ <string name="C307">B<xliff:g id="separator">=</xliff:g>Bissau<xliff:g id="timezone">|Affrica/Bissau</xliff:g></string>
+ <string name="C308">B<xliff:g id="separator">=</xliff:g>Bujumbura<xliff:g id="timezone">|Affrica/Bujumbura</xliff:g></string>
+ <string name="C309">D<xliff:g id="separator">=</xliff:g>Dili<xliff:g id="timezone">|Asia/Dili</xliff:g></string>
+ <string name="C310">D<xliff:g id="separator">=</xliff:g>Dushanbe<xliff:g id="timezone">|Asia/Dushanbe</xliff:g></string>
+ <string name="C311">F<xliff:g id="separator">=</xliff:g>Funafuti<xliff:g id="timezone">|Cefnfor_Tawel/Funafuti</xliff:g></string>
+ <string name="C312">H<xliff:g id="separator">=</xliff:g>Honiara<xliff:g id="timezone">|Cefnfor_Tawel/Guadalcanal</xliff:g></string>
+ <string name="C313">J<xliff:g id="separator">=</xliff:g>Juba<xliff:g id="timezone">|Affrica/Juba</xliff:g></string>
+ <string name="C314">K<xliff:g id="separator">=</xliff:g>Kingstown<xliff:g id="timezone">|America/St_Vincent</xliff:g></string>
+ <string name="C315">L<xliff:g id="separator">=</xliff:g>Libreville<xliff:g id="timezone">|Affrica/Libreville</xliff:g></string>
+ <string name="C316">L<xliff:g id="separator">=</xliff:g>Lomé<xliff:g id="timezone">|Affrica/Lome</xliff:g></string>
+ <string name="C317">L<xliff:g id="separator">=</xliff:g>Luanda<xliff:g id="timezone">|Affrica/Luanda</xliff:g></string>
+ <string name="C318">L<xliff:g id="separator">=</xliff:g>Lusaka<xliff:g id="timezone">|Affrica/Lusaka</xliff:g></string>
+ <string name="C319">M<xliff:g id="separator">=</xliff:g>Majuro<xliff:g id="timezone">|Cefnfor_Tawel/Majuro</xliff:g></string>
+ <string name="C320">M<xliff:g id="separator">=</xliff:g>Malabo<xliff:g id="timezone">|Affrica/Malabo</xliff:g></string>
+ <string name="C321">M<xliff:g id="separator">=</xliff:g>Maputo<xliff:g id="timezone">|Affrica/Maputo</xliff:g></string>
+ <string name="C322">M<xliff:g id="separator">=</xliff:g>Mbabane<xliff:g id="timezone">|Affrica/Mbabane</xliff:g></string>
+ <string name="C323">M<xliff:g id="separator">=</xliff:g>Moroni<xliff:g id="timezone">|Cefnfor_India/Comoro</xliff:g></string>
+ <string name="C324">N<xliff:g id="separator">=</xliff:g>N\'Djamena<xliff:g id="timezone">|Affrica/Ndjamena</xliff:g></string>
+ <string name="C325">N<xliff:g id="separator">=</xliff:g>Ngerulmud<xliff:g id="timezone">|Cefnfor_Tawel/Palau</xliff:g></string>
+ <string name="C326">N<xliff:g id="separator">=</xliff:g>Niamey<xliff:g id="timezone">|Affrica/Niamey</xliff:g></string>
+ <string name="C327">N<xliff:g id="separator">=</xliff:g>Nicosia<xliff:g id="timezone">|Ewrop/Nicosia</xliff:g></string>
+ <string name="C328">N<xliff:g id="separator">=</xliff:g>Nouakchott<xliff:g id="timezone">|Affrica/Nouakchott</xliff:g></string>
+ <string name="C329">N<xliff:g id="separator">=</xliff:g>Nuku\'alofa<xliff:g id="timezone">|Cefnfor_Tawel/Tongatapu</xliff:g></string>
+ <string name="C330">O<xliff:g id="separator">=</xliff:g>Ouagadougou<xliff:g id="timezone">|Affrica/Ouagadougou</xliff:g></string>
+ <string name="C331">P<xliff:g id="separator">=</xliff:g>Palikir<xliff:g id="timezone">|Cefnfor_Tawel/Noumea</xliff:g></string>
+ <string name="C332">P<xliff:g id="separator">=</xliff:g>Philipsburg<xliff:g id="timezone">|America/Lower_Princes</xliff:g></string>
+ <string name="C333">P<xliff:g id="separator">=</xliff:g>Podgorica<xliff:g id="timezone">|Ewrop/Podgorica</xliff:g></string>
+ <string name="C334">P<xliff:g id="separator">=</xliff:g>Porth Moresby<xliff:g id="timezone">|Cefnfor_Tawel/Palau</xliff:g></string>
+ <string name="C335">P<xliff:g id="separator">=</xliff:g>Porth Vila<xliff:g id="timezone">|Cefnfor_Tawel/Efate</xliff:g></string>
+ <string name="C336">P<xliff:g id="separator">=</xliff:g>Porto-Novo<xliff:g id="timezone">|Affrica/Porto-Novo</xliff:g></string>
+ <string name="C337">P<xliff:g id="separator">=</xliff:g>Priština<xliff:g id="timezone">|Ewrop/Beograd</xliff:g></string>
+ <string name="C338">R<xliff:g id="separator">=</xliff:g>Roseau<xliff:g id="timezone">|America/Dominica</xliff:g></string>
+ <string name="C339">T<xliff:g id="separator">=</xliff:g>Tashkent<xliff:g id="timezone">|Asia/Tashkent</xliff:g></string>
+ <string name="C340">T<xliff:g id="separator">=</xliff:g>Tbilisi<xliff:g id="timezone">|Asia/Tbilisi</xliff:g></string>
+ <string name="C341">T<xliff:g id="separator">=</xliff:g>Thimphu<xliff:g id="timezone">|Asia/Thimphu</xliff:g></string>
+ <string name="C342">T<xliff:g id="separator">=</xliff:g>Tirana<xliff:g id="timezone">|Ewrop/Tirane</xliff:g></string>
+ <string name="C343">V<xliff:g id="separator">=</xliff:g>Vaduz<xliff:g id="timezone">|Ewrop/Vaduz</xliff:g></string>
+ <string name="C344">V<xliff:g id="separator">=</xliff:g>Vientiane<xliff:g id="timezone">|Asia/Vientiane</xliff:g></string>
+ <string name="C345">W<xliff:g id="separator">=</xliff:g>Windhoek<xliff:g id="timezone">|Affrica/Windhoek</xliff:g></string>
+ <string name="C346">Y<xliff:g id="separator">=</xliff:g>Yaoundé<xliff:g id="timezone">|Affrica/Douala</xliff:g></string>
+ <string name="C347">Y<xliff:g id="separator">=</xliff:g>Yaren District<xliff:g id="timezone">|Cefnfor_Tawel/Nauru</xliff:g></string>
+ <string name="C348">Y<xliff:g id="separator">=</xliff:g>Yerevan<xliff:g id="timezone">|Asia/Yerevan</xliff:g></string>
+</resources>
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
new file mode 100644
index 0000000..7fbb73e
--- /dev/null
+++ b/res/values-cy/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Effaith troi\'r ddyfais drosodd</string>
+ <string name="shake_action_title">Effaith ysgwyd y ddyfais</string>
+ <string-array name="action_setting_entries">
+ <item>Hepian</item>
+ <item>Diystyru</item>
+ <item>Dim byd</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Tanio larymau ac amseryddion</string>
+ <string name="alarm_missed_channel">Larymau wedi\'u methu</string>
+ <string name="alarm_snooze_channel">Larymau wedi\'u hepian</string>
+ <string name="alarm_upcoming_channel">Larymau yn dod i fyny</string>
+ <string name="stopwatch_channel">Stopwats</string>
+ <string name="timer_channel">Amserydd</string>
+</resources>
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
new file mode 100644
index 0000000..8290309
--- /dev/null
+++ b/res/values-cy/strings.xml
@@ -0,0 +1,462 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 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.
+ -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+ <string name="app_label">Cloc</string>
+ <string name="label">Label</string>
+ <string name="default_label">Larwm</string>
+ <string name="alarm_vibrate">Dirgrynu</string>
+ <string name="alarm_repeat">Ailadrodd</string>
+ <string name="delete">Dileu</string>
+ <string name="default_alarm_ringtone_title">Tôn larwm rhagosodedig</string>
+ <string name="alarm_sound">Sain larwm</string>
+ <string name="timer_sound">Sain amserydd</string>
+ <string name="add_new_sound">Ychwanegu newydd</string>
+ <string name="remove_sound">Tynnu</string>
+ <string name="confirm_remove_custom_ringtone">Bydd larymau ac amseryddion sy\'n defnyddio\'r sain hon yn chwarae\'r sain rhagosodedig yn lle.</string>
+ <string name="your_sounds">Dy seiniau</string>
+ <string name="device_sounds">Seiniau\'r ddyfais</string>
+ <string name="custom_ringtone_lost_permissions">Ni ellir cyrchu\'r cynnwys sain.</string>
+ <string name="default_timer_ringtone_title">Amserydd wedi Dod i Ben</string>
+ <string name="alarm_tomorrow">Yfory</string>
+ <string name="alarm_today">Heddiw</string>
+ <string name="alarm_alert_dismiss_text">Gwrthod</string>
+ <string name="alarm_missed_title">Larwm wedi\'i methu</string>
+ <string name="alarm_missed_text"><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">Yn caniatáu hepian</string>
+ <plurals name="alarm_alert_snooze_duration">
+ <item quantity="zero"><xliff:g id="number" example="7">%d</xliff:g> mun</item>
+ <item quantity="one">1 mun</item>
+ <item quantity="two"><xliff:g id="number" example="7">%d</xliff:g> fun</item>
+ <item quantity="few"><xliff:g id="number" example="7">%d</xliff:g> mun</item>
+ <item quantity="many"><xliff:g id="number" example="7">%d</xliff:g> mun</item>
+ <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> mun</item>
+ </plurals>
+ <string name="alarm_alert_off_text">Larwm i ffwrdd</string>
+ <string name="alarm_alert_snooze_text">Hepian</string>
+ <plurals name="alarm_alert_snooze_set">
+ <item quantity="zero">Yn caniatáu hepian am <xliff:g id="minutes">%d</xliff:g> munudau.</item>
+ <item quantity="one">Yn caniatáu hepian am 1 munud.</item>
+ <item quantity="two">Yn caniatáu hepian am <xliff:g id="minutes">%d</xliff:g> funud.</item>
+ <item quantity="few">Yn caniatáu hepian am <xliff:g id="minutes">%d</xliff:g> munud.</item>
+ <item quantity="many">Yn caniatáu hepian am <xliff:g id="minutes">%d</xliff:g> munud.</item>
+ <item quantity="other">Yn caniatáu hepian am <xliff:g id="minutes">%d</xliff:g> munud.</item>
+ </plurals>
+ <string name="alarm_alert_snooze_until">Yn hepian nes <xliff:g id="time">%s</xliff:g></string>
+ <string name="alarm_alert_predismiss_title">Larwm yn dod i fyny</string>
+ <string name="missed_alarm_has_been_deleted">Mae dy larwm wedi\'i fethu wedi ei dileu</string>
+ <string name="timer_notifications_less_min">Llai na funud i fynd</string>
+ <string name="timer_notifications_hours"><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"><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"><xliff:g id="HOURS" example="2 hours">%1$s</xliff:g> <xliff:g id="MINUTES" example="2 minutes">%2$s</xliff:g> yn weddill</string>
+ <string name="timer_notifications_seconds"><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"><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"><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"><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">Ychwanegwyd un munud i\'r amserydd, <xliff:g id="TIME" example="5 hours remaining">%1$s</xliff:g></string>
+ <string name="timer_accessibility_stopped">Amserydd wedi\'i seibio, <xliff:g id="TIME" example="5 hours remaining">%1$s</xliff:g></string>
+ <string name="timer_accessibility_started">Amserydd yn rhedeg, <xliff:g id="TIME" example="5 hours remaining">%1$s</xliff:g></string>
+ <string name="timer_remaining_single">yn weddill</string>
+ <string name="timer_remaining_multiple">yn weddill</string>
+ <string-array name="alarm_set">
+ <item>Mae\'r larwm wedi\'i osod ar gyfer llai na funud o nawr.</item>
+ <item>Gosodwyd y larwm i ganu ymhen <xliff:g id="DAYS" example="2 days">%1$s</xliff:g> o nawr.</item>
+ <item>Mae\'r larwm wedi\'i osod ar gyfer <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g> o nawr.</item>
+ <item>Gosodwyd y larwm i ganu ymhen <xliff:g id="DAYS" example="2 days">%1$s</xliff:g>, <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g> o nawr.</item>
+ <item>Mae\'r larwm wedi\'i osod ar gyfer <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> o nawr.</item>
+ <item>Gosodwyd y larwm i ganu ymhen <xliff:g id="DAYS" example="2 days">%1$s</xliff:g>, <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> o nawr.</item>
+ <item>Mae\'r larwm wedi\'i osod ar gyfer <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g> a <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> o nawr.</item>
+ <item>Gosodwyd y larwm i ganu ymhen <xliff:g id="DAYS" example="2 days">%1$s</xliff:g>, <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g>, <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> o nawr.</item>
+ </string-array>
+ <plurals name="days">
+ <item quantity="zero"><xliff:g id="number" example="7">%s</xliff:g> diwrnodau</item>
+ <item quantity="one">1 diwrnod</item>
+ <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> ddiwrnod</item>
+ <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> diwrnod</item>
+ <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> diwrnod</item>
+ <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> diwrnod</item>
+ </plurals>
+ <plurals name="hours">
+ <item quantity="zero"><xliff:g id="number" example="7">%s</xliff:g> oriau</item>
+ <item quantity="one">1 awr</item>
+ <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> awr</item>
+ <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> awr</item>
+ <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> awr</item>
+ <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> awr</item>
+ </plurals>
+ <plurals name="hours_short">
+ <item quantity="zero"><xliff:g id="number" example="7">%s</xliff:g> awr</item>
+ <item quantity="one">1 awr</item>
+ <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> awr</item>
+ <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> awr</item>
+ <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> awr</item>
+ <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> awr</item>
+ </plurals>
+ <plurals name="minutes">
+ <item quantity="zero"><xliff:g id="number" example="7">%s</xliff:g> munudau</item>
+ <item quantity="one">1 munud</item>
+ <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> funud</item>
+ <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> munud</item>
+ <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> munud</item>
+ <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> munud</item>
+ </plurals>
+ <plurals name="minutes_short">
+ <item quantity="zero"><xliff:g id="number" example="7">%s</xliff:g> mun</item>
+ <item quantity="one">1 mun</item>
+ <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> fun</item>
+ <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> mun</item>
+ <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> mun</item>
+ <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> mun</item>
+ </plurals>
+ <plurals name="seconds">
+ <item quantity="zero"><xliff:g id="number" example="7">%s</xliff:g> eiliadau</item>
+ <item quantity="one">1 eiliad</item>
+ <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> eiliad</item>
+ <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> eiliad</item>
+ <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> eiliad</item>
+ <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> eiliad</item>
+ </plurals>
+ <string name="every_day">Pob dydd</string>
+ <string name="day_concat">", "</string>
+ <string name="loading_widget">Yn llwytho\u2026</string>
+ <string name="analog_gadget">Cloc analog</string>
+ <string name="digital_gadget">Cloc digidol</string>
+ <string name="settings">Gosodiadau</string>
+ <string name="snooze_duration_title">Hyd hepian</string>
+ <string name="crescendo_duration_title">Cynyddu\'r sain yn raddol</string>
+ <string name="auto_silence_title">Distawrwydd ar ôl</string>
+ <plurals name="auto_silence_summary">
+ <item quantity="zero"><xliff:g id="formatted_number" example="7">%s</xliff:g> munudau</item>
+ <item quantity="one">1 munud</item>
+ <item quantity="two"><xliff:g id="formatted_number" example="7">%s</xliff:g> funud</item>
+ <item quantity="few"><xliff:g id="formatted_number" example="7">%s</xliff:g> munud</item>
+ <item quantity="many"><xliff:g id="formatted_number" example="7">%s</xliff:g> munud</item>
+ <item quantity="other"><xliff:g id="formatted_number" example="7">%s</xliff:g> munud</item>
+ </plurals>
+ <string name="auto_silence_never">Byth</string>
+ <string-array name="auto_silence_entries">
+ <item>1 munud</item>
+ <item>5 munud</item>
+ <item>10 munud</item>
+ <item>15 munud</item>
+ <item>20 munud</item>
+ <item>25 munud</item>
+ <item>Byth</item>
+ </string-array>
+ <string-array name="crescendo_entries">
+ <item>I ffwrdd</item>
+ <item>5 eiliad</item>
+ <item>10 eiliad</item>
+ <item>15 eiliad</item>
+ <item>20 eiliad</item>
+ <item>25 eiliad</item>
+ <item>30 eiliad</item>
+ <item>35 eiliad</item>
+ <item>40 eiliad</item>
+ <item>45 eiliad</item>
+ <item>50 eiliad</item>
+ <item>55 eiliad</item>
+ <item>60 eiliad</item>
+ </string-array>
+ <string-array name="snooze_duration_entries">
+ <item>1 munud</item>
+ <item>2 funud</item>
+ <item>3 munud</item>
+ <item>4 munud</item>
+ <item>5 munud</item>
+ <item>6 munud</item>
+ <item>7 munud</item>
+ <item>8 munud</item>
+ <item>9 munud</item>
+ <item>10 munud</item>
+ <item>11 munud</item>
+ <item>12 munud</item>
+ <item>13 munud</item>
+ <item>14 munud</item>
+ <item>15 munud</item>
+ <item>16 munud</item>
+ <item>17 munud</item>
+ <item>18 munud</item>
+ <item>19 munud</item>
+ <item>20 munud</item>
+ <item>21 munud</item>
+ <item>22 munud</item>
+ <item>23 munud</item>
+ <item>24 munud</item>
+ <item>25 munud</item>
+ <item>26 munud</item>
+ <item>27 munud</item>
+ <item>28 munud</item>
+ <item>29 munud</item>
+ <item>30 munud</item>
+ </string-array>
+ <string name="week_start_title">Dechrau\'r wythnos ar</string>
+ <string-array name="week_start_entries">
+ <item>Dydd Sadwrn</item>
+ <item>Dydd Sul</item>
+ <item>Dydd Llun</item>
+ </string-array>
+ <string name="alarm_volume_title">Uchder sain larymau</string>
+ <string name="silent_ringtone_title">Distaw</string>
+ <string name="unknown_ringtone_title">Anhysbys</string>
+ <string name="alarm_volume_muted">Larymau wedi\'u distewi</string>
+ <string name="unmute_alarm_volume">Dad-distewi</string>
+ <string name="silent_default_alarm_ringtone">Mae\'r tôn larwm arferol yn ddistaw</string>
+ <string name="change_setting_action">Newid</string>
+ <string name="app_notifications_blocked">Mae hysbysiadau cloc wedi\'u rhwystro</string>
+ <string name="alarms_blocked_by_dnd">Mae\'r ddyfais wedi\'i gosod i ddistawrwydd llwyr</string>
+ <string name="volume_button_setting_title">Botymau uchder sain</string>
+ <string-array name="volume_button_setting_entries">
+ <item>Hepian</item>
+ <item>Diystyru</item>
+ <item>Rheoli uchder sain</item>
+ </string-array>
+ <string name="label_description">Label</string>
+ <string name="ringtone_description">Tôn caniad</string>
+ <string name="menu_alarm">Larwm</string>
+ <string name="menu_timer">Amserydd</string>
+ <string name="menu_clock">Cloc</string>
+ <string name="menu_stopwatch">Cloc amseru</string>
+ <string name="button_alarms">Ychwanegu larwm</string>
+ <string name="button_cities">Dinasoedd</string>
+ <string name="menu_item_settings">Gosodiadau</string>
+ <string name="menu_item_help">Cymorth</string>
+ <string name="menu_item_night_mode">Arbedwr sgrin</string>
+ <string name="menu_item_sort_by_gmt_offset">Trefnu\'n ôl amser</string>
+ <string name="menu_item_sort_by_name">Trefnu\'n ôl enw</string>
+ <string name="selected_cities_label">Dinasoedd a Ddewiswyd</string>
+ <string name="sw_resume_button">Parhau</string>
+ <string name="sw_reset_button">Ailosod</string>
+ <string name="sw_start_button">Dechrau</string>
+ <string name="sw_pause_button">Saib</string>
+ <string name="sw_lap_button">Lap</string>
+ <string name="sw_share_button">Rhannu</string>
+ <string name="hours_label">a</string>
+ <string name="minutes_label">m</string>
+ <string name="seconds_label">e</string>
+ <string name="timer_setup_description"><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"># <xliff:g id="lapNumber">%d</xliff:g></string>
+ <string name="lap_number_double_digit"># <xliff:g id="lapNumber">%02d</xliff:g></string>
+ <string name="sw_share_main">Fy amser i yw <xliff:g id="time">%s</xliff:g></string>
+ <string name="sw_share_laps">Amseroedd lapiau:</string>
+ <string name="sw_notification_lap_number">Lap <xliff:g id="number">%d</xliff:g></string>
+ <string name="timer_add_timer">Ychwanegu Amserydd</string>
+ <string name="timer_start">Dechrau</string>
+ <string name="timer_delete">Dileu</string>
+ <string name="timer_descriptive_delete">Dileu <xliff:g id="number_string">%s</xliff:g></string>
+ <string name="timer_plus_one">Ychwanegu 1 Munud</string>
+ <string name="timer_add_minute">+ 1:00</string>
+ <string name="timer_plus_1_min">Ychwanegu 1 munud</string>
+ <string name="timer_stop">Stopio</string>
+ <string name="timer_stop_all">Stopio pob amserydd</string>
+ <string name="timer_reset">Ailosod</string>
+ <string name="timer_cancel">Diddymu</string>
+ <string name="timer_canceled">Diddymwyd yr amserydd</string>
+ <string name="timer_times_up">Amser ar ben</string>
+ <string name="timer_multi_times_up"><xliff:g id="NUM_TIMERS" example="2">%d</xliff:g> amserydd wedi dod i ben</string>
+ <string name="timer_multi_missed"><xliff:g id="number" example="2">%d</xliff:g> amserydd wedi eu methu</string>
+ <string name="timer_notification_label">Amserydd</string>
+ <string name="missed_timer_notification_label">Amserydd wedi\'i methu</string>
+ <string name="missed_named_timer_notification_label">Amserydd wedi\'i methu: <xliff:g id="name" example="Pick up kids">%s</xliff:g></string>
+ <string name="timer_pause">Saib</string>
+ <string name="timer_reset_all">Ailosod pob amserydd</string>
+ <string name="hours_minutes_seconds"><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"><xliff:g id="minutes" example="3">%1$d</xliff:g>:<xliff:g id="seconds" example="44">%2$02d</xliff:g></string>
+ <string name="seconds"><xliff:g id="seconds" example="44">%d</xliff:g></string>
+ <string-array name="sw_share_strings" translatable="true">
+ <item>Dy amseroedd di</item>
+ <item>Dy amseroedd di</item>
+ <item>Mae Android yn gyflym, ond nid mor gyflym ag wyt ti!</item>
+ <item>Dy amseroedd di</item>
+ <item>Dy amseroedd di</item>
+ <item>Dy amseroedd di</item>
+ <item>Dy amseroedd di</item>
+ <item>Dy amseroedd di</item>
+ <item>Dy amseroedd di</item>
+ <item>Dy amseroedd di</item>
+ </string-array>
+ <string name="home_label">Cartref</string>
+ <string name="cities_activity_title">Dinasoedd</string>
+ <string name="clock_settings">Cloc</string>
+ <string name="clock_style">Arddull</string>
+ <string name="display_clock_seconds_pref">Dangos yr amser gydag eiliadau</string>
+ <string name="open_date_settings">Newid dyddiad ac amser</string>
+ <string-array name="clock_style_entries">
+ <item>Analog</item>
+ <item>Digidol</item>
+ </string-array>
+ <string name="automatic_home_clock">Cloc adref awtomatig</string>
+ <string name="automatic_home_clock_summary">Wrth deithio rhywle ble mae\'r amser yn wahanol, ychwanega cloc ar gyfer adref.</string>
+ <string name="home_time_zone">Cylchfa amser adref</string>
+ <string name="home_time_zone_title">Cylchfa amser adref</string>
+ <string name="city_checked"><xliff:g id="city_name">%s</xliff:g> wedi ei ddewis</string>
+ <string name="city_unchecked"><xliff:g id="city_name">%s</xliff:g> heb ei ddewis</string>
+ <string-array name="timezone_labels" tools:ignore="Typos">
+ <item>"Ynysoedd Marshall"</item>
+ <item>"Ynys Midway"</item>
+ <item>"Hawaii"</item>
+ <item>"Alasga"</item>
+ <item>"Amser y Cefnfor Tawel"</item>
+ <item>"Tijuana"</item>
+ <item>"Arizona"</item>
+ <item>"Chihuahua"</item>
+ <item>"Amser y Mynyddoedd (Gog. America)"</item>
+ <item>"Canolbarth America"</item>
+ <item>"Amser y Canolbarth (Gog. America)"</item>
+ <item>"Dinas Mecsico"</item>
+ <item>"Saskatchewan"</item>
+ <item>"Bogota"</item>
+ <item>"Amser y Dwyrain (Gog. America)"</item>
+ <item>"Feneswela"</item>
+ <item>"Amser yr Iwerydd (Barbados)"</item>
+ <item>"Amser yr Iwerydd (Canada)"</item>
+ <item>"Manaus"</item>
+ <item>"Santiago"</item>
+ <item>"Y Tir Newydd"</item>
+ <item>"Brasilia"</item>
+ <item>"Buenos Aires"</item>
+ <item>"Yr Ynys Las"</item>
+ <item>"Montevideo"</item>
+ <item>"Canol yr Iwerydd"</item>
+ <item>"Asores"</item>
+ <item>"Ynysoedd Penrhyn Verde"</item>
+ <item>"Casablanca"</item>
+ <item>"Llundain, Dulyn"</item>
+ <item>"Amsterdam, Berlin"</item>
+ <item>"Beograd"</item>
+ <item>"Brwsel"</item>
+ <item>"Sarajevo"</item>
+ <item>"Windhoek"</item>
+ <item>"Amser Gorll. Affrica"</item>
+ <item>"Amman, Gwlad Iorddonen"</item>
+ <item>"Athen, Istanbul"</item>
+ <item>"Beirut, Libanus"</item>
+ <item>"Cairo"</item>
+ <item>"Helsinki"</item>
+ <item>"Jerwsalem"</item>
+ <item>"Minsk"</item>
+ <item>"Harare"</item>
+ <item>"Baghdad"</item>
+ <item>"Moscfa"</item>
+ <item>"Coweit"</item>
+ <item>"Nairobi"</item>
+ <item>"Tehran"</item>
+ <item>"Baku"</item>
+ <item>"Tbilisi"</item>
+ <item>"Yerevan"</item>
+ <item>"Dubai"</item>
+ <item>"Kabul"</item>
+ <item>"Islamabad, Karachi"</item>
+ <item>"Ural'sk"</item>
+ <item>"Ekaterinburg"</item>
+ <item>"Kolkata"</item>
+ <item>"Sri Lanka"</item>
+ <item>"Kathmandu"</item>
+ <item>"Astana"</item>
+ <item>"Yangon"</item>
+ <item>"Krasnoyarsk"</item>
+ <item>"Bangkok"</item>
+ <item>"Beijing"</item>
+ <item>"Hong Cong"</item>
+ <item>"Irkutsk"</item>
+ <item>"Kuala Lumpur"</item>
+ <item>"Perth"</item>
+ <item>"Taipei"</item>
+ <item>"Seoul"</item>
+ <item>"Tokyo, Osaka"</item>
+ <item>"Yakutsk"</item>
+ <item>"Adelaide"</item>
+ <item>"Darwin"</item>
+ <item>"Brisbane"</item>
+ <item>"Hobart"</item>
+ <item>"Sydney, Canberra"</item>
+ <item>"Vladivostok"</item>
+ <item>"Guam"</item>
+ <item>"Magadan"</item>
+ <item>"Auckland"</item>
+ <item>"Ffiji"</item>
+ <item>"Tonga"</item>
+ <item>"Jakarta"</item>
+ </string-array>
+ <string name="shortcut_new_alarm_short">Larwm newydd</string>
+ <string name="shortcut_new_alarm_long">Creu larwm newydd</string>
+ <string name="shortcut_new_timer_short">Amserydd newydd</string>
+ <string name="shortcut_new_timer_long">Creu amserydd newydd</string>
+ <string name="shortcut_start_stopwatch_short">Dechrau</string>
+ <string name="shortcut_start_stopwatch_long">Dechrau\'r stopwats</string>
+ <string name="shortcut_pause_stopwatch_short">Saib</string>
+ <string name="shortcut_pause_stopwatch_long">Seibio\'r stopwats</string>
+ <string name="shortcut_start_screensaver_short">Arbedwr sgrin</string>
+ <string name="shortcut_start_screensaver_long">Dechrau arbedwr sgrin</string>
+ <string name="alarm_settings">Larymau</string>
+ <string name="timer_service_desc">Mae\'n prosesu gweithredoedd o hysbysiadau amseru.</string>
+ <string name="stopwatch_service_desc">Mae\'n prosesu gweithredoedd o hysbysiadau stopwats.</string>
+ <string name="swn_paused">Wedi seibio</string>
+ <string name="description_direction_right">Llusga i\'r dde i\'w ddiystyru</string>
+ <string name="description_direction_left">Llusga i\'r chwith i hepian</string>
+ <string name="description_direction_both">Llusga i\'r chwith i hepian neu i\'r dde i ddiystyru</string>
+ <string name="timer_settings">Amseryddion</string>
+ <string name="timer_vibrate_title">Dirgryniad amserydd</string>
+ <string name="timer_paused">Amserydd wedi ei rewi</string>
+ <string name="timers_stopped"><xliff:g id="number" example="7">%d</xliff:g> amserydd wedi eu hoedi</string>
+ <string name="all_timers_stopped_notif">Tapia i weld dy amseryddion</string>
+ <string name="timers_in_use"><xliff:g id="number" example="7">%d</xliff:g> amserydd</string>
+ <string name="next_timer_notif">Amserydd nesaf: <xliff:g id="time_remaining" example="2 minutes remaining">%s</xliff:g></string>
+ <string name="screensaver_settings">Gosodiadau arbedwr sgrin</string>
+ <string name="night_mode_title">Modd nos</string>
+ <string name="night_mode_summary">Dangos â golau isel iawn (ar gyfer ystafelloedd tywyll)</string>
+ <string name="expand_alarm">Ehangu\'r larwm</string>
+ <string name="collapse_alarm">Lleihau\'r larwm</string>
+ <string name="alarm_undo">dad-wneud</string>
+ <string name="alarm_deleted">Dilëwyd y larwm</string>
+ <string name="world_day_of_week_label"> / <xliff:g id="label">%s</xliff:g></string>
+ <string name="world_time_ahead"><xliff:g id="time" example="6 hours">%1$s</xliff:g> ymlaen</string>
+ <string name="world_time_behind"><xliff:g id="time" example="4 hours">%1$s</xliff:g> tu ôl</string>
+ <string name="world_hours_minutes_ahead"><xliff:g id="hours" example="6 hr">%1$s</xliff:g> <xliff:g id="minutes" example="30 min">%2$s</xliff:g> ymlaen</string>
+ <string name="world_hours_minutes_behind"><xliff:g id="hours" example="6 hr">%1$s</xliff:g> <xliff:g id="minutes" example="30 min">%2$s</xliff:g> tu ôl</string>
+ <string name="world_hours_tomorrow">Yfory, <xliff:g id="time" example="6 hours ahead">%1$s</xliff:g></string>
+ <string name="world_hours_yesterday">Ddoe, <xliff:g id="time" example="4 hours behind">%1$s</xliff:g></string>
+ <string name="world_tomorrow">Yfory</string>
+ <string name="world_yesterday">Ddoe</string>
+ <string name="next_alarm_description">Larwm nesaf: <xliff:g id="alarm_time" example="Wed 8:00am">%s</xliff:g></string>
+ <string name="no_alarms">Dim Larymau</string>
+ <string name="invalid_time">Amser annilys <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">Dim larwm am <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">Dim larymau wedi\'u gosod</string>
+ <string name="no_label_specified">Dim label wedi\'i nodi</string>
+ <string name="no_alarms_with_label">Does dim larwm yn cynnwys y label</string>
+ <string name="no_alarm_scheduled_for_this_time">Does dim larwm wedi\'i osod ar gyfer yr amser hwn.</string>
+ <string name="alarm_is_dismissed">Larwm <xliff:g id="alarm_time" example="14:20">%s</xliff:g> wedi\'i ddiystyru</string>
+ <string name="alarm_is_set">Mae\'r larwm wedi\'i osod ar gyfer <xliff:g id="alarm_time" example="14:20">%s</xliff:g></string>
+ <string name="timer_created">Amserydd wedi\'i greu</string>
+ <plurals name="expired_timers_dismissed">
+ <item quantity="zero">Diystyrwyd <xliff:g id="number" example="5">%d</xliff:g> amseryddion</item>
+ <item quantity="one">Diystyrwyd yr amserydd</item>
+ <item quantity="two">Diystyrwyd <xliff:g id="number" example="5">%d</xliff:g> amserydd</item>
+ <item quantity="few">Diystyrwyd <xliff:g id="number" example="5">%d</xliff:g> amserydd</item>
+ <item quantity="many">Diystyrwyd <xliff:g id="number" example="5">%d</xliff:g> amserydd</item>
+ <item quantity="other">Diystyrwyd <xliff:g id="number" example="5">%d</xliff:g> amserydd</item>
+ </plurals>
+ <string name="timer_deleted">Amserydd wedi\'i ddileu</string>
+ <string name="invalid_timer_length">Hyd amserydd annilys</string>
+ <string name="invalid_timer">Dewiswyd amserydd annilys</string>
+ <string name="no_expired_timers">Dim amseryddion wedi dod i ben</string>
+ <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away">Ni ellir diystyru larwm <xliff:g id="alarm_time" example="14:20">%s</xliff:g> eto gan ei fod dros 24 awr i ffwrdd</string>
+ <string name="dismiss_alarm">Diystyru\'r larwm</string>
+ <string name="pick_alarm_to_dismiss">Dewis pa larwm i\'w ddiystyru</string>
+ <string name="no_firing_alarms">Dim larymau yn canu</string>
+ <string name="alarm_is_snoozed"><xliff:g id="alarm_time" example="14:20">%s</xliff:g> larwm yn caniatáu hepian am 10 munud</string>
+</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8ebd926..a9f46b8 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"I dag"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Slå fra"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Ubesvaret alarm"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Udsat"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> minutter</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Overskredet timer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Sæt på pause"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Nulstil alle timere"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
new file mode 100644
index 0000000..694aef0
--- /dev/null
+++ b/res/values-de/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Aktion beim Umdrehen</string>
+ <string name="shake_action_title">Aktion beim Schütteln</string>
+ <string-array name="action_setting_entries">
+ <item>Schlummern</item>
+ <item>Verwerfen</item>
+ <item>Keine Aktion</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Starten von Alarmen & Timern</string>
+ <string name="alarm_missed_channel">Entgangene Weckrufe</string>
+ <string name="alarm_snooze_channel">Schlummernde Weckrufe</string>
+ <string name="alarm_upcoming_channel">Anstehende Weckrufe</string>
+ <string name="stopwatch_channel">Stoppuhr</string>
+ <string name="timer_channel">Timer</string>
+</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 89040ef..4242b7b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Heute"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Ausschalten"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Entgangener Weckruf"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g>–<xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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>
@@ -76,7 +76,7 @@
<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> Tage</item>
+ <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> Tagen</item>
<item quantity="one">1 Tag</item>
</plurals>
<plurals name="hours" formatted="false" msgid="3871283109767171655">
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Verpasster Timer: <xliff:g id="NAME">%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">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
new file mode 100644
index 0000000..3201fdf
--- /dev/null
+++ b/res/values-el/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Ενέργεια αναποδογυρίσματος συσκευής</string>
+ <string name="shake_action_title">Ενέργεια κουνήματος συσκευής</string>
+ <string-array name="action_setting_entries">
+ <item>Αναβολή</item>
+ <item>Παράβλεψη</item>
+ <item>Καμία</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Ξυπνητήρια & χρονοδιακόπτες</string>
+ <string name="alarm_missed_channel">Χαμένα ξυπνητήρια</string>
+ <string name="alarm_snooze_channel">Ξυπνητήρια σε αναβολή</string>
+ <string name="alarm_upcoming_channel">Επόμενα ξυπνητήρια</string>
+ <string name="stopwatch_channel">Χρονόμετρο</string>
+ <string name="timer_channel">Αντίστροφη μέτρηση</string>
+</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 70a7aab..e9b31ab 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> λεπτά</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Χρονοδιακόπτης που παραλείφθηκε: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Παύση"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Επαν. χρονομ."</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
new file mode 100644
index 0000000..21a0823
--- /dev/null
+++ b/res/values-en-rAU/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Device flip action</string>
+ <string name="shake_action_title">Device shake action</string>
+ <string-array name="action_setting_entries">
+ <item>Snooze</item>
+ <item>Dismiss</item>
+ <item>Nothing</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Firing alarms & timers</string>
+ <string name="alarm_missed_channel">Missed alarms</string>
+ <string name="alarm_snooze_channel">Snoozed alarms</string>
+ <string name="alarm_upcoming_channel">Upcoming alarms</string>
+ <string name="stopwatch_channel">Stopwatch</string>
+ <string name="timer_channel">Timer</string>
+</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 7f33b4a..725d049 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Today"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Dismiss"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Missed alarm"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Snoozed"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Missed timer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pause"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Reset all timers"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-en-rCA/cm_strings.xml b/res/values-en-rCA/cm_strings.xml
new file mode 100644
index 0000000..21a0823
--- /dev/null
+++ b/res/values-en-rCA/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Device flip action</string>
+ <string name="shake_action_title">Device shake action</string>
+ <string-array name="action_setting_entries">
+ <item>Snooze</item>
+ <item>Dismiss</item>
+ <item>Nothing</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Firing alarms & timers</string>
+ <string name="alarm_missed_channel">Missed alarms</string>
+ <string name="alarm_snooze_channel">Snoozed alarms</string>
+ <string name="alarm_upcoming_channel">Upcoming alarms</string>
+ <string name="stopwatch_channel">Stopwatch</string>
+ <string name="timer_channel">Timer</string>
+</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 7f33b4a..725d049 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Today"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Dismiss"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Missed alarm"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Snoozed"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Missed timer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pause"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Reset all timers"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
new file mode 100644
index 0000000..21a0823
--- /dev/null
+++ b/res/values-en-rGB/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Device flip action</string>
+ <string name="shake_action_title">Device shake action</string>
+ <string-array name="action_setting_entries">
+ <item>Snooze</item>
+ <item>Dismiss</item>
+ <item>Nothing</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Firing alarms & timers</string>
+ <string name="alarm_missed_channel">Missed alarms</string>
+ <string name="alarm_snooze_channel">Snoozed alarms</string>
+ <string name="alarm_upcoming_channel">Upcoming alarms</string>
+ <string name="stopwatch_channel">Stopwatch</string>
+ <string name="timer_channel">Timer</string>
+</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 7f33b4a..725d049 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Today"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Dismiss"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Missed alarm"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Snoozed"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Missed timer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pause"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Reset all timers"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
new file mode 100644
index 0000000..21a0823
--- /dev/null
+++ b/res/values-en-rIN/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Device flip action</string>
+ <string name="shake_action_title">Device shake action</string>
+ <string-array name="action_setting_entries">
+ <item>Snooze</item>
+ <item>Dismiss</item>
+ <item>Nothing</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Firing alarms & timers</string>
+ <string name="alarm_missed_channel">Missed alarms</string>
+ <string name="alarm_snooze_channel">Snoozed alarms</string>
+ <string name="alarm_upcoming_channel">Upcoming alarms</string>
+ <string name="stopwatch_channel">Stopwatch</string>
+ <string name="timer_channel">Timer</string>
+</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 7f33b4a..725d049 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Today"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Dismiss"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Missed alarm"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Snoozed"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Missed timer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pause"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Reset all timers"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
new file mode 100644
index 0000000..08e8b4c
--- /dev/null
+++ b/res/values-eo/strings.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 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.
+ -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+ <string name="app_label">Horloĝo</string>
+ <string name="label">Etikedo</string>
+ <string name="delete">Forigi</string>
+ <string name="alarm_tomorrow">Morgaŭ</string>
+ <string name="alarm_today">Hodiaŭ</string>
+ <plurals name="days">
+ <item quantity="one">1 tago</item>
+ <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> tagoj</item>
+ </plurals>
+ <string name="day_concat">", "</string>
+ <string name="settings">Agordoj</string>
+ <plurals name="auto_silence_summary">
+ <item quantity="one">1 minuto</item>
+ <item quantity="other"><xliff:g id="formatted_number" example="7">%s</xliff:g> minutoj</item>
+ </plurals>
+ <string name="auto_silence_never">Neniam</string>
+ <string-array name="auto_silence_entries">
+ <item>1 minuto</item>
+ <item>5 minutoj</item>
+ <item>10 minutoj</item>
+ <item>15 minutoj</item>
+ <item>20 minutoj</item>
+ <item>25 minutoj</item>
+ <item>Neniam</item>
+ </string-array>
+ <string-array name="snooze_duration_entries">
+ <item>1 minuto</item>
+ <item>2 minutes</item>
+ <item>3 minutes</item>
+ <item>4 minutes</item>
+ <item>5 minutoj</item>
+ <item>6 minutes</item>
+ <item>7 minutes</item>
+ <item>8 minutes</item>
+ <item>9 minutes</item>
+ <item>10 minutoj</item>
+ <item>11 minutes</item>
+ <item>12 minutes</item>
+ <item>13 minutes</item>
+ <item>14 minutes</item>
+ <item>15 minutoj</item>
+ <item>16 minutes</item>
+ <item>17 minutes</item>
+ <item>18 minutes</item>
+ <item>19 minutes</item>
+ <item>20 minutoj</item>
+ <item>21 minutes</item>
+ <item>22 minutes</item>
+ <item>23 minutes</item>
+ <item>24 minutes</item>
+ <item>25 minutoj</item>
+ <item>26 minutes</item>
+ <item>27 minutes</item>
+ <item>28 minutes</item>
+ <item>29 minutes</item>
+ <item>30 minutes</item>
+ </string-array>
+ <string name="label_description">Etikedo</string>
+ <string name="menu_item_settings">Agordoj</string>
+ <string name="sw_share_button">Konigi</string>
+ <string name="seconds_label">s</string>
+ <string name="timer_delete">Forigi</string>
+ <string name="timer_cancel">Nuligi</string>
+ <string name="night_mode_title">Nokta reĝimo</string>
+ <string name="world_tomorrow">Morgaŭ</string>
+</resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
new file mode 100644
index 0000000..2031153
--- /dev/null
+++ b/res/values-es-rUS/cm_strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Acción al voltear el dispositivo</string>
+ <string name="shake_action_title">Acción al agitar el dispositivo</string>
+ <string-array name="action_setting_entries">
+ <item>Repetir alarma</item>
+ <item>Descartar</item>
+ <item>Nada</item>
+ </string-array>
+</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8b9ad7a..688aa1d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Hoy"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Descartar"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarma perdida"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g>: <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Pospuesta"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Recordatorio perdido: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pausar"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Restablecer"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
new file mode 100644
index 0000000..1cf83db
--- /dev/null
+++ b/res/values-es/cm_strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Voltear dispositivo</string>
+ <string name="shake_action_title">Agitar dispositivo</string>
+ <string-array name="action_setting_entries">
+ <item>Posponer</item>
+ <item>Descartar</item>
+ <item>Nada</item>
+ </string-array>
+</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5baf887..ee90ae5 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Hoy"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Descartar"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarma perdida"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Pospuesta"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Recordatorio perdido: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pausar"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Restablecer todo"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-et/cm_strings.xml b/res/values-et/cm_strings.xml
new file mode 100644
index 0000000..44aa503
--- /dev/null
+++ b/res/values-et/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Tegevus seadme pööramisel</string>
+ <string name="shake_action_title">Tegevus seadme raputamisel</string>
+ <string-array name="action_setting_entries">
+ <item>Kordus</item>
+ <item>Tühista</item>
+ <item>Mitte midagi</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Toimuvad äratused ja taimerid</string>
+ <string name="alarm_missed_channel">Märkamata jäänud äratused</string>
+ <string name="alarm_snooze_channel">Edasilükatud äratused</string>
+ <string name="alarm_upcoming_channel">Tulevased äratused</string>
+ <string name="stopwatch_channel">Stopper</string>
+ <string name="timer_channel">Taimer</string>
+</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 737c52f..113b8d0 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Täna"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Loobu"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Märkamata jäänud alarm"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Ed. lükat."</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Vahelejäänud taimer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Peata"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Lähtesta kõik taimerid"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-eu/cm_strings.xml b/res/values-eu/cm_strings.xml
new file mode 100644
index 0000000..084da75
--- /dev/null
+++ b/res/values-eu/cm_strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Gailua buruz behera jartzearen ekintza</string>
+ <string name="shake_action_title">Gailua astientzen denerako ekintza</string>
+ <string-array name="action_setting_entries">
+ <item>Atzeratu</item>
+ <item>Baztertu</item>
+ <item>Ezer ez</item>
+ </string-array>
+</resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index e87aa46..6caf801 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Gaur"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Baztertu"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarmari ezikusi egin zaio"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Atzeratuta"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Galdutako tenporizadorea: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pausatu"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Berrezarri guztiak"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index bbb94f3..6d38b5c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> دقیقه</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"تایمر ازدسترفته: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"مکث"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"بازنشانی همه تایمرها"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
new file mode 100644
index 0000000..d040a43
--- /dev/null
+++ b/res/values-fi/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Laitteen kääntö</string>
+ <string name="shake_action_title">Laitteen ravistus</string>
+ <string-array name="action_setting_entries">
+ <item>Torkku</item>
+ <item>Hylkää</item>
+ <item>Ei mitään</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Hälytysten & ajastimien laukaisu</string>
+ <string name="alarm_missed_channel">Vastaamattomat hälytykset</string>
+ <string name="alarm_snooze_channel">Torkutetut hälytykset</string>
+ <string name="alarm_upcoming_channel">Tulevat hälytykset</string>
+ <string name="stopwatch_channel">Sekuntikello</string>
+ <string name="timer_channel">Ajastin</string>
+</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 79580c8..bd9f98f 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Tänään"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Ohita"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Vastaamaton ilmoitus"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Torkutettu"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Ohitettu ajastin: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Keskeytä"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Nollaa ajastimet"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>.<xliff:g id="MINUTES">%02d</xliff:g>.<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>.<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 7cbbc35..847e6fc 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Aujourd\'hui"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Ignorer"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarme manquée"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Reportée"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Rappel manqué : <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Interrompre"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Réinit. toutes les minuteries"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
new file mode 100644
index 0000000..81ab7e0
--- /dev/null
+++ b/res/values-fr/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Action lorsque l\'appareil est retourné</string>
+ <string name="shake_action_title">Action lorsque l\'appareil est secoué</string>
+ <string-array name="action_setting_entries">
+ <item>Répéter</item>
+ <item>Ignorer</item>
+ <item>Aucune</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Déclenchement d\'alarmes et de minuteurs</string>
+ <string name="alarm_missed_channel">Alarmes manquées</string>
+ <string name="alarm_snooze_channel">Alarmes reportées</string>
+ <string name="alarm_upcoming_channel">Alarmes imminentes</string>
+ <string name="stopwatch_channel">Chronomètre</string>
+ <string name="timer_channel">Minuteur</string>
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3e17fd9..7550388 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Aujourd\'hui"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Quitter"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarme manquée"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Rappel manqué : <xliff:g id="NAME">%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">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
new file mode 100644
index 0000000..f344e81
--- /dev/null
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Aksje by tastel omdraaie</string>
+ <string name="shake_action_title">Aksje by tastel skodzje</string>
+ <string-array name="action_setting_entries">
+ <item>Snooze</item>
+ <item>Utskeakelje</item>
+ <item>Neat</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Alarms & timers oan it starten</string>
+ <string name="alarm_missed_channel">Miste alarms</string>
+ <string name="alarm_snooze_channel">Slommere alarms</string>
+ <string name="alarm_upcoming_channel">Oankommende alarms</string>
+ <string name="stopwatch_channel">Stopwatch</string>
+ <string name="timer_channel">Timer</string>
+</resources>
diff --git a/res/values-gd/cities.xml b/res/values-gd/cities.xml
new file mode 100644
index 0000000..4017e03
--- /dev/null
+++ b/res/values-gd/cities.xml
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 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
+ -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools" tools:ignore="Typos">
+ <string name="C1">A<xliff:g id="separator">=</xliff:g>Abidjan<xliff:g id="timezone">|Africa/Abidjan</xliff:g></string>
+ <string name="C2">A<xliff:g id="separator">=</xliff:g>Accra<xliff:g id="timezone">|Africa/Accra</xliff:g></string>
+ <string name="C3">A<xliff:g id="separator">=</xliff:g>Addis Abeba<xliff:g id="timezone">|Africa/Addis_Ababa</xliff:g></string>
+ <string name="C4">A<xliff:g id="separator">=</xliff:g>Dzayer (Algiers)<xliff:g id="timezone">|Africa/Algiers</xliff:g></string>
+ <string name="C5">B<xliff:g id="separator">=</xliff:g>Blantyre<xliff:g id="timezone">|Africa/Blantyre</xliff:g></string>
+ <string name="C6">B<xliff:g id="separator">=</xliff:g>Brazzaville<xliff:g id="timezone">|Africa/Brazzaville</xliff:g></string>
+ <string name="C7">C<xliff:g id="separator">=</xliff:g>Cairo<xliff:g id="timezone">|Africa/Cairo</xliff:g></string>
+ <string name="C8">C<xliff:g id="separator">=</xliff:g>Casablanca<xliff:g id="timezone">|Africa/Casablanca</xliff:g></string>
+ <string name="C9">C<xliff:g id="separator">=</xliff:g>Conakry<xliff:g id="timezone">|Africa/Conakry</xliff:g></string>
+ <string name="C10">D<xliff:g id="separator">=</xliff:g>Dakar<xliff:g id="timezone">|Africa/Dakar</xliff:g></string>
+ <string name="C11">D<xliff:g id="separator">=</xliff:g>Dàr as-Salàm<xliff:g id="timezone">|Africa/Dar_es_Salaam</xliff:g></string>
+ <string name="C12">D<xliff:g id="separator">=</xliff:g>Diobùtaidh<xliff:g id="timezone">|Africa/Djibouti</xliff:g></string>
+ <string name="C13">F<xliff:g id="separator">=</xliff:g>Freetown<xliff:g id="timezone">|Africa/Freetown</xliff:g></string>
+ <string name="C14">G<xliff:g id="separator">=</xliff:g>Gaborone<xliff:g id="timezone">|Africa/Gaborone</xliff:g></string>
+ <string name="C15">H<xliff:g id="separator">=</xliff:g>Harare<xliff:g id="timezone">|Africa/Harare</xliff:g></string>
+ <string name="C16">H<xliff:g id="separator">=</xliff:g>Hannsaborgh<xliff:g id="timezone">|Africa/Johannesburg</xliff:g></string>
+ <string name="C17">K<xliff:g id="separator">=</xliff:g>Kampala<xliff:g id="timezone">|Africa/Kampala</xliff:g></string>
+ <string name="C18">K<xliff:g id="separator">=</xliff:g>Khartoum<xliff:g id="timezone">|Africa/Khartoum</xliff:g></string>
+ <string name="C19">K<xliff:g id="separator">=</xliff:g>Kigali<xliff:g id="timezone">|Africa/Kigali</xliff:g></string>
+ <string name="C20">K<xliff:g id="separator">=</xliff:g>Kinshasa<xliff:g id="timezone">|Africa/Kinshasa</xliff:g></string>
+ <string name="C21">L<xliff:g id="separator">=</xliff:g>Lagos<xliff:g id="timezone">|Africa/Lagos</xliff:g></string>
+ <string name="C22">M<xliff:g id="separator">=</xliff:g>Maseru<xliff:g id="timezone">|Africa/Maseru</xliff:g></string>
+ <string name="C23">M<xliff:g id="separator">=</xliff:g>Mogadishu<xliff:g id="timezone">|Africa/Mogadishu</xliff:g></string>
+ <string name="C24">N<xliff:g id="separator">=</xliff:g>Nairobi<xliff:g id="timezone">|Africa/Nairobi</xliff:g></string>
+ <string name="C25">S<xliff:g id="separator">=</xliff:g>São Tomé<xliff:g id="timezone">|Africa/Sao_Tome</xliff:g></string>
+ <string name="C26">T<xliff:g id="separator">=</xliff:g>Timbuktu<xliff:g id="timezone">|Africa/Timbuktu</xliff:g></string>
+ <string name="C27">T<xliff:g id="separator">=</xliff:g>Tripoli<xliff:g id="timezone">|Africa/Tripoli</xliff:g></string>
+ <string name="C28">T<xliff:g id="separator">=</xliff:g>Tunis<xliff:g id="timezone">|Africa/Tunis</xliff:g></string>
+ <string name="C29">A<xliff:g id="separator">=</xliff:g>Anchorage<xliff:g id="timezone">|America/Anchorage</xliff:g></string>
+ <string name="C31">A<xliff:g id="separator">=</xliff:g>Arùba<xliff:g id="timezone">|America/Aruba</xliff:g></string>
+ <string name="C32">A<xliff:g id="separator">=</xliff:g>Asunción<xliff:g id="timezone">|America/Asuncion</xliff:g></string>
+ <string name="C33">B<xliff:g id="separator">=</xliff:g>Barbados<xliff:g id="timezone">|America/Barbados</xliff:g></string>
+ <string name="C34">B<xliff:g id="separator">=</xliff:g>A’ Bheilìs<xliff:g id="timezone">|America/Belize</xliff:g></string>
+ <string name="C35">B<xliff:g id="separator">=</xliff:g>Bogotá<xliff:g id="timezone">|America/Bogota</xliff:g></string>
+ <string name="C36">B<xliff:g id="separator">=</xliff:g>Buenos Aires<xliff:g id="timezone">|America/Buenos_Aires</xliff:g></string>
+ <string name="C37">C<xliff:g id="separator">=</xliff:g>Cancún/Ni’ Su’uk<xliff:g id="timezone">|America/Cancun</xliff:g></string>
+ <string name="C38">C<xliff:g id="separator">=</xliff:g>Caracas<xliff:g id="timezone">|America/Caracas</xliff:g></string>
+ <string name="C39">C<xliff:g id="separator">=</xliff:g>Cayman<xliff:g id="timezone">|America/Cayman</xliff:g></string>
+ <string name="C40">C<xliff:g id="separator">=</xliff:g>Chicago<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C42">C<xliff:g id="separator">=</xliff:g>Curaçao<xliff:g id="timezone">|America/Curacao</xliff:g></string>
+ <string name="C43">D<xliff:g id="separator">=</xliff:g>Dawson Creek<xliff:g id="timezone">|America/Dawson_Creek</xliff:g></string>
+ <string name="C44">D<xliff:g id="separator">=</xliff:g>Denver<xliff:g id="timezone">|America/Denver</xliff:g></string>
+ <string name="C45">D<xliff:g id="separator">=</xliff:g>Detroit<xliff:g id="timezone">|America/Detroit</xliff:g></string>
+ <string name="C46">D<xliff:g id="separator">=</xliff:g>Doiminicea<xliff:g id="timezone">|America/Dominica</xliff:g></string>
+ <string name="C47">E<xliff:g id="separator">=</xliff:g>Edmonton<xliff:g id="timezone">|America/Edmonton</xliff:g></string>
+ <string name="C48">E<xliff:g id="separator">=</xliff:g>An Salbhador<xliff:g id="timezone">|America/El_Salvador</xliff:g></string>
+ <string name="C49">F<xliff:g id="separator">=</xliff:g>Fortaleza<xliff:g id="timezone">|America/Fortaleza</xliff:g></string>
+ <string name="C50">T<xliff:g id="separator">=</xliff:g>An Tuirc Mhòr<xliff:g id="timezone">|America/Grand_Turk</xliff:g></string>
+ <string name="C51">G<xliff:g id="separator">=</xliff:g>Greanàda<xliff:g id="timezone">|America/Grenada</xliff:g></string>
+ <string name="C52">G<xliff:g id="separator">=</xliff:g>Cathair Ghuatamala<xliff:g id="timezone">|America/Guatemala</xliff:g></string>
+ <string name="C53">G<xliff:g id="separator">=</xliff:g>Guidheàna<xliff:g id="timezone">|America/Guyana</xliff:g></string>
+ <string name="C54">H<xliff:g id="separator">=</xliff:g>An t-Àrd-bhaile (Halafacs)<xliff:g id="timezone">|America/Halifax</xliff:g></string>
+ <string name="C55">H<xliff:g id="separator">=</xliff:g>Havana<xliff:g id="timezone">|America/Havana</xliff:g></string>
+ <string name="C56">I<xliff:g id="separator">=</xliff:g>Indianapolis<xliff:g id="timezone">|America/Indiana/Indianapolis</xliff:g></string>
+ <string name="C57">K<xliff:g id="separator">=</xliff:g>Knox<xliff:g id="timezone">|America/Indiana/Knox</xliff:g></string>
+ <string name="C58">M<xliff:g id="separator">=</xliff:g>Marengo<xliff:g id="timezone">|America/Indiana/Marengo</xliff:g></string>
+ <string name="C59">P<xliff:g id="separator">=</xliff:g>Petersburg<xliff:g id="timezone">|America/Indiana/Petersburg</xliff:g></string>
+ <string name="C60">T<xliff:g id="separator">=</xliff:g>Tell City<xliff:g id="timezone">|America/Indiana/Tell_City</xliff:g></string>
+ <string name="C61">V<xliff:g id="separator">=</xliff:g>Vevay<xliff:g id="timezone">|America/Indiana/Vevay</xliff:g></string>
+ <string name="C62">V<xliff:g id="separator">=</xliff:g>Vincennes<xliff:g id="timezone">|America/Indiana/Vincennes</xliff:g></string>
+ <string name="C63">W<xliff:g id="separator">=</xliff:g>Winamac<xliff:g id="timezone">|America/Indiana/Winamac</xliff:g></string>
+ <string name="C64">K<xliff:g id="separator">=</xliff:g>Kingston<xliff:g id="timezone">|America/Jamaica</xliff:g></string>
+ <string name="C65">P<xliff:g id="separator">=</xliff:g>Nuestra Señora de La Paz<xliff:g id="timezone">|America/La_Paz</xliff:g></string>
+ <string name="C66">L<xliff:g id="separator">=</xliff:g>Lima<xliff:g id="timezone">|America/Lima</xliff:g></string>
+ <string name="C67">L<xliff:g id="separator">=</xliff:g>Los Angeles<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C68">L<xliff:g id="separator">=</xliff:g>Louisville<xliff:g id="timezone">|America/Louisville</xliff:g></string>
+ <string name="C69">M<xliff:g id="separator">=</xliff:g>Managua<xliff:g id="timezone">|America/Managua</xliff:g></string>
+ <string name="C70">M<xliff:g id="separator">=</xliff:g>Mairtinic<xliff:g id="timezone">|America/Martinique</xliff:g></string>
+ <string name="C71">M<xliff:g id="separator">=</xliff:g>Mendoza<xliff:g id="timezone">|America/Mendoza</xliff:g></string>
+ <string name="C72">M<xliff:g id="separator">=</xliff:g>Metlakatla<xliff:g id="timezone">|America/Metlakatla</xliff:g></string>
+ <string name="C73">M<xliff:g id="separator">=</xliff:g>Cathair Mheagsago<xliff:g id="timezone">|America/Mexico_City</xliff:g></string>
+ <string name="C74">M<xliff:g id="separator">=</xliff:g>Monterrey<xliff:g id="timezone">|America/Monterrey</xliff:g></string>
+ <string name="C75">M<xliff:g id="separator">=</xliff:g>Montevideo<xliff:g id="timezone">|America/Montevideo</xliff:g></string>
+ <string name="C76">M<xliff:g id="separator">=</xliff:g>Montreal<xliff:g id="timezone">|America/Montreal</xliff:g></string>
+ <string name="C77">N<xliff:g id="separator">=</xliff:g>Nassau<xliff:g id="timezone">|America/Nassau</xliff:g></string>
+ <string name="C78">N<xliff:g id="separator">=</xliff:g>Nuadh Eabhrac<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C79">B<xliff:g id="separator">=</xliff:g>Beulah<xliff:g id="timezone">|America/North_Dakota/Beulah</xliff:g></string>
+ <string name="C80">C<xliff:g id="separator">=</xliff:g>Center<xliff:g id="timezone">|America/North_Dakota/Center</xliff:g></string>
+ <string name="C81">N<xliff:g id="separator">=</xliff:g>New Salem<xliff:g id="timezone">|America/North_Dakota/New_Salem</xliff:g></string>
+ <string name="C82">P<xliff:g id="separator">=</xliff:g>Panama<xliff:g id="timezone">|America/Panama</xliff:g></string>
+ <string name="C83">P<xliff:g id="separator">=</xliff:g>Phoenix<xliff:g id="timezone">|America/Phoenix</xliff:g></string>
+ <string name="C84">P<xliff:g id="separator">=</xliff:g>Port na Spàinne<xliff:g id="timezone">|America/Port_of_Spain</xliff:g></string>
+ <string name="C85">P<xliff:g id="separator">=</xliff:g>Port-au-Prince<xliff:g id="timezone">|America/Port-au-Prince</xliff:g></string>
+ <string name="C86">P<xliff:g id="separator">=</xliff:g>Porto Rìceo<xliff:g id="timezone">|America/Puerto_Rico</xliff:g></string>
+ <string name="C87">S<xliff:g id="separator">=</xliff:g>Santo Domingo<xliff:g id="timezone">|America/Santo_Domingo</xliff:g></string>
+ <string name="C88">S<xliff:g id="separator">=</xliff:g>São Paulo<xliff:g id="timezone">|America/Sao_Paulo</xliff:g></string>
+ <string name="C89">S<xliff:g id="separator">=</xliff:g>St. John’s<xliff:g id="timezone">|America/St_Johns</xliff:g></string>
+ <string name="C90">N<xliff:g id="separator">=</xliff:g>Naomh Crìstean<xliff:g id="timezone">|America/St_Kitts</xliff:g></string>
+ <string name="C91">N<xliff:g id="separator">=</xliff:g>Naomh Lùisea<xliff:g id="timezone">|America/St_Lucia</xliff:g></string>
+ <string name="C92">S<xliff:g id="separator">=</xliff:g>St. Thomas<xliff:g id="timezone">|America/St_Thomas</xliff:g></string>
+ <string name="C93">T<xliff:g id="separator">=</xliff:g>Tijuana<xliff:g id="timezone">|America/Tijuana</xliff:g></string>
+ <string name="C94">T<xliff:g id="separator">=</xliff:g>Toronto<xliff:g id="timezone">|America/Toronto</xliff:g></string>
+ <string name="C95">V<xliff:g id="separator">=</xliff:g>Vancouver<xliff:g id="timezone">|America/Vancouver</xliff:g></string>
+ <string name="C96">W<xliff:g id="separator">=</xliff:g>Winnipeg<xliff:g id="timezone">|America/Winnipeg</xliff:g></string>
+ <string name="C97">P<xliff:g id="separator">=</xliff:g>Am Pòla a Deas<xliff:g id="timezone">|Antarctica/South_Pole</xliff:g></string>
+ <string name="C98">L<xliff:g id="separator">=</xliff:g>Longyearbyen<xliff:g id="timezone">|Arctic/Longyearbyen</xliff:g></string>
+ <string name="C99">A<xliff:g id="separator">=</xliff:g>Almaty<xliff:g id="timezone">|Asia/Almaty</xliff:g></string>
+ <string name="C100">A<xliff:g id="separator">=</xliff:g>Ammān<xliff:g id="timezone">|Asia/Amman</xliff:g></string>
+ <string name="C101">A<xliff:g id="separator">=</xliff:g>Anadyr<xliff:g id="timezone">|Asia/Anadyr</xliff:g></string>
+ <string name="C102">A<xliff:g id="separator">=</xliff:g>Aqtau<xliff:g id="timezone">|Asia/Aqtau</xliff:g></string>
+ <string name="C103">B<xliff:g id="separator">=</xliff:g>Baghdad<xliff:g id="timezone">|Asia/Baghdad</xliff:g></string>
+ <string name="C104">B<xliff:g id="separator">=</xliff:g>Bachrain<xliff:g id="timezone">|Asia/Bahrain</xliff:g></string>
+ <string name="C105">B<xliff:g id="separator">=</xliff:g>Baku<xliff:g id="timezone">|Asia/Baku</xliff:g></string>
+ <string name="C106">B<xliff:g id="separator">=</xliff:g>Bangkok<xliff:g id="timezone">|Asia/Bangkok</xliff:g></string>
+ <string name="C107">B<xliff:g id="separator">=</xliff:g>Beirut<xliff:g id="timezone">|Asia/Beirut</xliff:g></string>
+ <string name="C108">K<xliff:g id="separator">=</xliff:g>Kolkata<xliff:g id="timezone">|Asia/Calcutta</xliff:g></string>
+ <string name="C109">D<xliff:g id="separator">=</xliff:g>Damascus<xliff:g id="timezone">|Asia/Damascus</xliff:g></string>
+ <string name="C110">D<xliff:g id="separator">=</xliff:g>Dhaka<xliff:g id="timezone">|Asia/Dhaka</xliff:g></string>
+ <string name="C111">D<xliff:g id="separator">=</xliff:g>Dubai<xliff:g id="timezone">|Asia/Dubai</xliff:g></string>
+ <string name="C112">G<xliff:g id="separator">=</xliff:g>Gàsa<xliff:g id="timezone">|Asia/Gaza</xliff:g></string>
+ <string name="C113">H<xliff:g id="separator">=</xliff:g>Hebron<xliff:g id="timezone">|Asia/Hebron</xliff:g></string>
+ <string name="C114">H<xliff:g id="separator">=</xliff:g>Ho Chi Minh<xliff:g id="timezone">|Asia/Ho_Chi_Minh</xliff:g></string>
+ <string name="C115">H<xliff:g id="separator">=</xliff:g>Hong Kong<xliff:g id="timezone">|Asia/Hong_Kong</xliff:g></string>
+ <string name="C117">J<xliff:g id="separator">=</xliff:g>Jakarta<xliff:g id="timezone">|Asia/Jakarta</xliff:g></string>
+ <string name="C118">I<xliff:g id="separator">=</xliff:g>Ierusalam<xliff:g id="timezone">|Asia/Jerusalem</xliff:g></string>
+ <string name="C119">K<xliff:g id="separator">=</xliff:g>Kabul<xliff:g id="timezone">|Asia/Kabul</xliff:g></string>
+ <string name="C120">K<xliff:g id="separator">=</xliff:g>Karachi<xliff:g id="timezone">|Asia/Karachi</xliff:g></string>
+ <string name="C121">K<xliff:g id="separator">=</xliff:g>Kathmandu<xliff:g id="timezone">|Asia/Kathmandu</xliff:g></string>
+ <string name="C122">K<xliff:g id="separator">=</xliff:g>Kuala Lumpur<xliff:g id="timezone">|Asia/Kuala_Lumpur</xliff:g></string>
+ <string name="C123">C<xliff:g id="separator">=</xliff:g>Cuibhèit<xliff:g id="timezone">|Asia/Kuwait</xliff:g></string>
+ <string name="C124">M<xliff:g id="separator">=</xliff:g>Macàthu<xliff:g id="timezone">|Asia/Macau</xliff:g></string>
+ <string name="C125">M<xliff:g id="separator">=</xliff:g>Manila<xliff:g id="timezone">|Asia/Manila</xliff:g></string>
+ <string name="C126">M<xliff:g id="separator">=</xliff:g>Muscat<xliff:g id="timezone">|Asia/Muscat</xliff:g></string>
+ <string name="C127">P<xliff:g id="separator">=</xliff:g>Phnom Penh<xliff:g id="timezone">|Asia/Phnom_Penh</xliff:g></string>
+ <string name="C128">P<xliff:g id="separator">=</xliff:g>Pyeongyang<xliff:g id="timezone">|Asia/Pyongyang</xliff:g></string>
+ <string name="C130">R<xliff:g id="separator">=</xliff:g>Rangun<xliff:g id="timezone">|Asia/Rangoon</xliff:g></string>
+ <string name="C131">R<xliff:g id="separator">=</xliff:g>Riyadh<xliff:g id="timezone">|Asia/Riyadh</xliff:g></string>
+ <string name="C133">S<xliff:g id="separator">=</xliff:g>Seoul<xliff:g id="timezone">|Asia/Seoul</xliff:g></string>
+ <string name="C134">S<xliff:g id="separator">=</xliff:g>Shanghai<xliff:g id="timezone">|Asia/Shanghai</xliff:g></string>
+ <string name="C135">S<xliff:g id="separator">=</xliff:g>Singeapòr<xliff:g id="timezone">|Asia/Singapore</xliff:g></string>
+ <string name="C136">T<xliff:g id="separator">=</xliff:g>Taipei<xliff:g id="timezone">|Asia/Taipei</xliff:g></string>
+ <string name="C137">T<xliff:g id="separator">=</xliff:g>Tehrān<xliff:g id="timezone">|Asia/Tehran</xliff:g></string>
+ <string name="C138">T<xliff:g id="separator">=</xliff:g>Tel Aviv<xliff:g id="timezone">|Asia/Tel_Aviv</xliff:g></string>
+ <string name="C139">T<xliff:g id="separator">=</xliff:g>Tōkyō<xliff:g id="timezone">|Asia/Tokyo</xliff:g></string>
+ <string name="C140">U<xliff:g id="separator">=</xliff:g>Ulaanbaatar<xliff:g id="timezone">|Asia/Ulaanbaatar</xliff:g></string>
+ <string name="C141">B<xliff:g id="separator">=</xliff:g>Bearmùda<xliff:g id="timezone">|Atlantic/Bermuda</xliff:g></string>
+ <string name="C142">C<xliff:g id="separator">=</xliff:g>Na h-Eileanan Canàrach<xliff:g id="timezone">|Atlantic/Canary</xliff:g></string>
+ <string name="C143">C<xliff:g id="separator">=</xliff:g>An Ceap Uaine<xliff:g id="timezone">|Atlantic/Cape_Verde</xliff:g></string>
+ <string name="C144">R<xliff:g id="separator">=</xliff:g>Reykjavík<xliff:g id="timezone">|Atlantic/Reykjavik</xliff:g></string>
+ <string name="C145">S<xliff:g id="separator">=</xliff:g>Stanley<xliff:g id="timezone">|Atlantic/Stanley</xliff:g></string>
+ <string name="C146">A<xliff:g id="separator">=</xliff:g>Adelaide<xliff:g id="timezone">|Australia/Adelaide</xliff:g></string>
+ <string name="C147">B<xliff:g id="separator">=</xliff:g>Brisbane<xliff:g id="timezone">|Australia/Brisbane</xliff:g></string>
+ <string name="C148">C<xliff:g id="separator">=</xliff:g>Canberra<xliff:g id="timezone">|Australia/Canberra</xliff:g></string>
+ <string name="C149">D<xliff:g id="separator">=</xliff:g>Darwin<xliff:g id="timezone">|Australia/Darwin</xliff:g></string>
+ <string name="C150">M<xliff:g id="separator">=</xliff:g>Melbourne<xliff:g id="timezone">|Australia/Melbourne</xliff:g></string>
+ <string name="C151">N<xliff:g id="separator">=</xliff:g>New South Wales<xliff:g id="timezone">|Australia/NSW</xliff:g></string>
+ <string name="C152">P<xliff:g id="separator">=</xliff:g>Peairt<xliff:g id="timezone">|Australia/Perth</xliff:g></string>
+ <string name="C153">Q<xliff:g id="separator">=</xliff:g>Queensland<xliff:g id="timezone">|Australia/Queensland</xliff:g></string>
+ <string name="C154">S<xliff:g id="separator">=</xliff:g>Sidni<xliff:g id="timezone">|Australia/Sydney</xliff:g></string>
+ <string name="C155">V<xliff:g id="separator">=</xliff:g>Victoria<xliff:g id="timezone">|Australia/Victoria</xliff:g></string>
+ <string name="C156">T<xliff:g id="separator">=</xliff:g>Talamh an Èisg<xliff:g id="timezone">|Canada/Newfoundland</xliff:g></string>
+ <string name="C157">S<xliff:g id="separator">=</xliff:g>Saskatchewan<xliff:g id="timezone">|Canada/Saskatchewan</xliff:g></string>
+ <string name="C158">C<xliff:g id="separator">=</xliff:g>Eilean na Càisge (Rapa Nui)<xliff:g id="timezone">|Chile/EasterIsland</xliff:g></string>
+ <string name="C159">A<xliff:g id="separator">=</xliff:g>Amsterdam<xliff:g id="timezone">|Europe/Amsterdam</xliff:g></string>
+ <string name="C160">A<xliff:g id="separator">=</xliff:g>Andorra<xliff:g id="timezone">|Europe/Andorra</xliff:g></string>
+ <string name="C161">A<xliff:g id="separator">=</xliff:g>Baile na h‑Àithne<xliff:g id="timezone">|Europe/Athens</xliff:g></string>
+ <string name="C162">B<xliff:g id="separator">=</xliff:g>Béal Feirste<xliff:g id="timezone">|Europe/Belfast</xliff:g></string>
+ <string name="C163">B<xliff:g id="separator">=</xliff:g>Beograd<xliff:g id="timezone">|Europe/Belgrade</xliff:g></string>
+ <string name="C164">B<xliff:g id="separator">=</xliff:g>Berlin<xliff:g id="timezone">|Europe/Berlin</xliff:g></string>
+ <string name="C165">B<xliff:g id="separator">=</xliff:g>Bratislava<xliff:g id="timezone">|Europe/Bratislava</xliff:g></string>
+ <string name="C166">B<xliff:g id="separator">=</xliff:g>A’ Bhruiseal<xliff:g id="timezone">|Europe/Brussels</xliff:g></string>
+ <string name="C167">B<xliff:g id="separator">=</xliff:g>Bucharest<xliff:g id="timezone">|Europe/Bucharest</xliff:g></string>
+ <string name="C168">B<xliff:g id="separator">=</xliff:g>Budapest<xliff:g id="timezone">|Europe/Budapest</xliff:g></string>
+ <string name="C169">C<xliff:g id="separator">=</xliff:g>Chișinău<xliff:g id="timezone">|Europe/Chisinau</xliff:g></string>
+ <string name="C170">B<xliff:g id="separator">=</xliff:g>Beirbh<xliff:g id="timezone">|Europe/Copenhagen</xliff:g></string>
+ <string name="C171">A<xliff:g id="separator">=</xliff:g>Baile Átha Cliath<xliff:g id="timezone">|Europe/Dublin</xliff:g></string>
+ <string name="C172">G<xliff:g id="separator">=</xliff:g>Diobraltar<xliff:g id="timezone">|Europe/Gibraltar</xliff:g></string>
+ <string name="C173">H<xliff:g id="separator">=</xliff:g>Helsinki<xliff:g id="timezone">|Europe/Helsinki</xliff:g></string>
+ <string name="C174">M<xliff:g id="separator">=</xliff:g>Eilean Mhanainn<xliff:g id="timezone">|Europe/Isle_of_Man</xliff:g></string>
+ <string name="C175">I<xliff:g id="separator">=</xliff:g>Istanbul<xliff:g id="timezone">|Europe/Istanbul</xliff:g></string>
+ <string name="C176">K<xliff:g id="separator">=</xliff:g>Kiev<xliff:g id="timezone">|Europe/Kiev</xliff:g></string>
+ <string name="C177">L<xliff:g id="separator">=</xliff:g>Lisbon<xliff:g id="timezone">|Europe/Lisbon</xliff:g></string>
+ <string name="C178">L<xliff:g id="separator">=</xliff:g>Lunnainn<xliff:g id="timezone">|Europe/London</xliff:g></string>
+ <string name="C179">L<xliff:g id="separator">=</xliff:g>Lugsamburg<xliff:g id="timezone">|Europe/Luxembourg</xliff:g></string>
+ <string name="C180">M<xliff:g id="separator">=</xliff:g>Madrid<xliff:g id="timezone">|Europe/Madrid</xliff:g></string>
+ <string name="C181">M<xliff:g id="separator">=</xliff:g>Malta<xliff:g id="timezone">|Europe/Malta</xliff:g></string>
+ <string name="C182">M<xliff:g id="separator">=</xliff:g>Minsk<xliff:g id="timezone">|Europe/Minsk</xliff:g></string>
+ <string name="C183">M<xliff:g id="separator">=</xliff:g>Monaco<xliff:g id="timezone">|Europe/Monaco</xliff:g></string>
+ <string name="C184">M<xliff:g id="separator">=</xliff:g>Mosgo<xliff:g id="timezone">|Europe/Moscow</xliff:g></string>
+ <string name="C185">O<xliff:g id="separator">=</xliff:g>Oslo<xliff:g id="timezone">|Europe/Oslo</xliff:g></string>
+ <string name="C186">P<xliff:g id="separator">=</xliff:g>Paras<xliff:g id="timezone">|Europe/Paris</xliff:g></string>
+ <string name="C187">P<xliff:g id="separator">=</xliff:g>Pràg<xliff:g id="timezone">|Europe/Prague</xliff:g></string>
+ <string name="C188">R<xliff:g id="separator">=</xliff:g>Rīga<xliff:g id="timezone">|Europe/Riga</xliff:g></string>
+ <string name="C189">R<xliff:g id="separator">=</xliff:g>An Ròimh<xliff:g id="timezone">|Europe/Rome</xliff:g></string>
+ <string name="C190">S<xliff:g id="separator">=</xliff:g>San Marino<xliff:g id="timezone">|Europe/San_Marino</xliff:g></string>
+ <string name="C191">S<xliff:g id="separator">=</xliff:g>Sarajevo<xliff:g id="timezone">|Europe/Sarajevo</xliff:g></string>
+ <string name="C192">S<xliff:g id="separator">=</xliff:g>Simferopol<xliff:g id="timezone">|Europe/Simferopol</xliff:g></string>
+ <string name="C193">S<xliff:g id="separator">=</xliff:g>Skopje<xliff:g id="timezone">|Europe/Skopje</xliff:g></string>
+ <string name="C194">S<xliff:g id="separator">=</xliff:g>Sofiya<xliff:g id="timezone">|Europe/Sofia</xliff:g></string>
+ <string name="C195">S<xliff:g id="separator">=</xliff:g>Stockholm<xliff:g id="timezone">|Europe/Stockholm</xliff:g></string>
+ <string name="C196">T<xliff:g id="separator">=</xliff:g>Tallinn<xliff:g id="timezone">|Europe/Tallinn</xliff:g></string>
+ <string name="C197">B<xliff:g id="separator">=</xliff:g>Cathair na Bhatacain<xliff:g id="timezone">|Europe/Vatican</xliff:g></string>
+ <string name="C198">V<xliff:g id="separator">=</xliff:g>Vienna<xliff:g id="timezone">|Europe/Vienna</xliff:g></string>
+ <string name="C199">V<xliff:g id="separator">=</xliff:g>Vilnius<xliff:g id="timezone">|Europe/Vilnius</xliff:g></string>
+ <string name="C200">W<xliff:g id="separator">=</xliff:g>Warsaw<xliff:g id="timezone">|Europe/Warsaw</xliff:g></string>
+ <string name="C201">Z<xliff:g id="separator">=</xliff:g>Zagreb<xliff:g id="timezone">|Europe/Zagreb</xliff:g></string>
+ <string name="C202">Z<xliff:g id="separator">=</xliff:g>Zürich<xliff:g id="timezone">|Europe/Zurich</xliff:g></string>
+ <string name="C203">A<xliff:g id="separator">=</xliff:g>Antananarivo<xliff:g id="timezone">|Indian/Antananarivo</xliff:g></string>
+ <string name="C204">M<xliff:g id="separator">=</xliff:g>Na h-Eileanan Mhaladaibh<xliff:g id="timezone">|Indian/Maldives</xliff:g></string>
+ <string name="C205">M<xliff:g id="separator">=</xliff:g>Na h-Eileanan Mhoiriseas<xliff:g id="timezone">|Indian/Mauritius</xliff:g></string>
+ <string name="C206">A<xliff:g id="separator">=</xliff:g>Auckland<xliff:g id="timezone">|Pacific/Auckland</xliff:g></string>
+ <string name="C207">F<xliff:g id="separator">=</xliff:g>Fìdi<xliff:g id="timezone">|Pacific/Fiji</xliff:g></string>
+ <string name="C208">G<xliff:g id="separator">=</xliff:g>Guam<xliff:g id="timezone">|Pacific/Guam</xliff:g></string>
+ <string name="C209">H<xliff:g id="separator">=</xliff:g>Honolulu<xliff:g id="timezone">|Pacific/Honolulu</xliff:g></string>
+ <string name="C210">K<xliff:g id="separator">=</xliff:g>Kiritimati<xliff:g id="timezone">|Pacific/Kiritimati</xliff:g></string>
+ <string name="C211">N<xliff:g id="separator">=</xliff:g>Noumea<xliff:g id="timezone">|Pacific/Noumea</xliff:g></string>
+ <string name="C214">A<xliff:g id="separator">=</xliff:g>Aintìoga<xliff:g id="timezone">|America/Antigua</xliff:g></string>
+ <string name="C215">A<xliff:g id="separator">=</xliff:g>Austin<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C216">B<xliff:g id="separator">=</xliff:g>Boston<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C217">C<xliff:g id="separator">=</xliff:g>Calgairidh<xliff:g id="timezone">|America/Denver</xliff:g></string>
+ <string name="C218">C<xliff:g id="separator">=</xliff:g>Columbus<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C219">D<xliff:g id="separator">=</xliff:g>Dallas<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C220">K<xliff:g id="separator">=</xliff:g>Knoxville<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C221">M<xliff:g id="separator">=</xliff:g>Memphis<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C222">M<xliff:g id="separator">=</xliff:g>Miami<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C223">M<xliff:g id="separator">=</xliff:g>Minneapolis<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C224">O<xliff:g id="separator">=</xliff:g>Ottawa<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C225">P<xliff:g id="separator">=</xliff:g>Philadelphia<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C226">P<xliff:g id="separator">=</xliff:g>Portland<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C227">S<xliff:g id="separator">=</xliff:g>San Diego<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C228">S<xliff:g id="separator">=</xliff:g>San Francisco<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C229">S<xliff:g id="separator">=</xliff:g>Salt Lake City<xliff:g id="timezone">|America/Denver</xliff:g></string>
+ <string name="C230">S<xliff:g id="separator">=</xliff:g>San José<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C231">S<xliff:g id="separator">=</xliff:g>San Salvador<xliff:g id="timezone">|America/Guatemala</xliff:g></string>
+ <string name="C232">S<xliff:g id="separator">=</xliff:g>Seattle<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C233">S<xliff:g id="separator">=</xliff:g>St. Louis<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C234">W<xliff:g id="separator">=</xliff:g>Washington, D.C.<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C235">H<xliff:g id="separator">=</xliff:g>Houston<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C236">S<xliff:g id="separator">=</xliff:g>San Antonio<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C237">J<xliff:g id="separator">=</xliff:g>Jacksonville<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C238">B<xliff:g id="separator">=</xliff:g>Baltimore<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C239">N<xliff:g id="separator">=</xliff:g>Nashville<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C240">M<xliff:g id="separator">=</xliff:g>Milwaukee<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C241">O<xliff:g id="separator">=</xliff:g>Oklahoma City<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C242">L<xliff:g id="separator">=</xliff:g>Las Vegas<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C243">A<xliff:g id="separator">=</xliff:g>Albuquerque<xliff:g id="timezone">|America/Denver</xliff:g></string>
+ <string name="C244">T<xliff:g id="separator">=</xliff:g>Tucson<xliff:g id="timezone">|MST</xliff:g></string>
+ <string name="C245">S<xliff:g id="separator">=</xliff:g>Sacramento<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C246">A<xliff:g id="separator">=</xliff:g>Atlanta<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C247">C<xliff:g id="separator">=</xliff:g>Cleveland<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C248">N<xliff:g id="separator">=</xliff:g>New Orleans<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C249">T<xliff:g id="separator">=</xliff:g>Tampa<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C250">P<xliff:g id="separator">=</xliff:g>Pittsburgh<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C251">C<xliff:g id="separator">=</xliff:g>Cincinnati<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C252">M<xliff:g id="separator">=</xliff:g>Mountain View<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C253">R<xliff:g id="separator">=</xliff:g>Reno<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C254">B<xliff:g id="separator">=</xliff:g>Black Rock City<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C255">D<xliff:g id="separator">=</xliff:g>Doha<xliff:g id="timezone">|Asia/Riyadh</xliff:g></string>
+ <string name="C256">B<xliff:g id="separator">=</xliff:g>Beijing<xliff:g id="timezone">|Asia/Shanghai</xliff:g></string>
+ <string name="C257">M<xliff:g id="separator">=</xliff:g>Mumbai<xliff:g id="timezone">|Asia/Kolkata</xliff:g></string>
+ <string name="C258">D<xliff:g id="separator">=</xliff:g>Delhi<xliff:g id="timezone">|Asia/Kolkata</xliff:g></string>
+ <string name="C259">O<xliff:g id="separator">=</xliff:g>Osaka<xliff:g id="timezone">|Asia/Tokyo</xliff:g></string>
+ <string name="C260">L<xliff:g id="separator">=</xliff:g>Lahore<xliff:g id="timezone">|Asia/Karachi</xliff:g></string>
+ <string name="C261">S<xliff:g id="separator">=</xliff:g>Sana’a<xliff:g id="timezone">|Asia/Riyadh</xliff:g></string>
+ <string name="C262">B<xliff:g id="separator">=</xliff:g>Barcelona<xliff:g id="timezone">|Europe/Madrid</xliff:g></string>
+ <string name="C263">M<xliff:g id="separator">=</xliff:g>München<xliff:g id="timezone">|Europe/Berlin</xliff:g></string>
+ <string name="C264">M<xliff:g id="separator">=</xliff:g>Milan<xliff:g id="timezone">|Europe/Rome</xliff:g></string>
+ <string name="C265">F<xliff:g id="separator">=</xliff:g>Frankfurt<xliff:g id="timezone">|Europe/Berlin</xliff:g></string>
+ <string name="C266">H<xliff:g id="separator">=</xliff:g>Hanoi<xliff:g id="timezone">|Asia/Bangkok</xliff:g></string>
+ <string name="C267">A<xliff:g id="separator">=</xliff:g>Ankara<xliff:g id="timezone">|Europe/Istanbul</xliff:g></string>
+ <string name="C268">B<xliff:g id="separator">=</xliff:g>Bangalore<xliff:g id="timezone">|Asia/Kolkata</xliff:g></string>
+ <string name="C269">B<xliff:g id="separator">=</xliff:g>Brasília<xliff:g id="timezone">|America/Sao_Paulo</xliff:g></string>
+ <string name="C270">B<xliff:g id="separator">=</xliff:g>Baile a’ Chip<xliff:g id="timezone">|Africa/Johannesburg</xliff:g></string>
+ <string name="C271">I<xliff:g id="separator">=</xliff:g>Islamabad<xliff:g id="timezone">|Asia/Karachi</xliff:g></string>
+ <string name="C272">R<xliff:g id="separator">=</xliff:g>Rio de Janeiro<xliff:g id="timezone">|America/Sao_Paulo</xliff:g></string>
+ <string name="C273">A<xliff:g id="separator">=</xliff:g>Ann Arbor<xliff:g id="timezone">|America/Detroit</xliff:g></string>
+ <string name="C274">B<xliff:g id="separator">=</xliff:g>Boulder<xliff:g id="timezone">|America/Denver</xliff:g></string>
+ <string name="C275">C<xliff:g id="separator">=</xliff:g>Cambridge<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C276">K<xliff:g id="separator">=</xliff:g>Kirkland<xliff:g id="timezone">|America/Los_Angeles</xliff:g></string>
+ <string name="C277">M<xliff:g id="separator">=</xliff:g>Madison<xliff:g id="timezone">|America/Chicago</xliff:g></string>
+ <string name="C278">G<xliff:g id="separator">=</xliff:g>Guangzhou<xliff:g id="timezone">|Asia/Shanghai</xliff:g></string>
+ <string name="C279">H<xliff:g id="separator">=</xliff:g>Hyderabad<xliff:g id="timezone">|Asia/Kolkata</xliff:g></string>
+ <string name="C280">R<xliff:g id="separator">=</xliff:g>Reston<xliff:g id="timezone">|America/New_York</xliff:g></string>
+ <string name="C281">B<xliff:g id="separator">=</xliff:g>Belo Horizonte<xliff:g id="timezone">|America/Sao_Paulo</xliff:g></string>
+ <string name="C282">S<xliff:g id="separator">=</xliff:g>Santiago<xliff:g id="timezone">|America/Santiago</xliff:g></string>
+ <string name="C283">M<xliff:g id="separator">=</xliff:g>Monrovia<xliff:g id="timezone">|Africa/Monrovia</xliff:g></string>
+ <string name="C284">C<xliff:g id="separator">=</xliff:g>Colombo<xliff:g id="timezone">|Asia/Colombo</xliff:g></string>
+ <string name="C285">C<xliff:g id="separator">=</xliff:g>Chihuahua<xliff:g id="timezone">|America/Chihuahua</xliff:g></string>
+ <string name="C286">S<xliff:g id="separator">=</xliff:g>Salvador<xliff:g id="timezone">|America/Sao_Paulo</xliff:g></string>
+ <string name="C287">G<xliff:g id="separator">=</xliff:g>Gurgaon<xliff:g id="timezone">|Asia/Kolkata</xliff:g></string>
+ <string name="C288">M<xliff:g id="separator">=</xliff:g>Manchester<xliff:g id="timezone">|Europe/London</xliff:g></string>
+ <string name="C290">N<xliff:g id="separator">=</xliff:g>Naomh Peadarborgh<xliff:g id="timezone">|Europe/Moscow</xliff:g></string>
+ <string name="C291">K<xliff:g id="separator">=</xliff:g>Kraków<xliff:g id="timezone">|Europe/Warsaw</xliff:g></string>
+ <string name="C292">W<xliff:g id="separator">=</xliff:g>Wrocław<xliff:g id="timezone">|Europe/Warsaw</xliff:g></string>
+ <string name="C293">H<xliff:g id="separator">=</xliff:g>Hamburg<xliff:g id="timezone">|Europe/Berlin</xliff:g></string>
+ <string name="C294">O<xliff:g id="separator">=</xliff:g>Oulu<xliff:g id="timezone">|Europe/Bucharest</xliff:g></string>
+ <string name="C295">H<xliff:g id="separator">=</xliff:g>Haifa<xliff:g id="timezone">|Asia/Jerusalem</xliff:g></string>
+ <string name="C296">S<xliff:g id="separator">=</xliff:g>San Juan<xliff:g id="timezone">|America/Puerto_Rico</xliff:g></string>
+ <string name="C297">T<xliff:g id="separator">=</xliff:g>Tegucigalpa<xliff:g id="timezone">|America/Tegucigalpa</xliff:g></string>
+ <string name="C298">P<xliff:g id="separator">=</xliff:g>Paramaribo<xliff:g id="timezone">|America/Paramaribo</xliff:g></string>
+ <string name="C299">Q<xliff:g id="separator">=</xliff:g>Quito<xliff:g id="timezone">|America/Panama</xliff:g></string>
+ <string name="C300">L<xliff:g id="separator">=</xliff:g>Ljubljana<xliff:g id="timezone">|Europe/Ljubljana</xliff:g></string>
+ <string name="C301">A<xliff:g id="separator">=</xliff:g>Aşgabat<xliff:g id="timezone">|Asia/Ashgabat</xliff:g></string>
+ <string name="C302">A<xliff:g id="separator">=</xliff:g>Asmara<xliff:g id="timezone">|Africa/Asmara</xliff:g></string>
+ <string name="C303">B<xliff:g id="separator">=</xliff:g>Bandar Seri Begawan<xliff:g id="timezone">|Asia/Brunei</xliff:g></string>
+ <string name="C304">B<xliff:g id="separator">=</xliff:g>Bangui<xliff:g id="timezone">|Africa/Bangui</xliff:g></string>
+ <string name="C305">B<xliff:g id="separator">=</xliff:g>Banjul<xliff:g id="timezone">|Africa/Banjul</xliff:g></string>
+ <string name="C306">B<xliff:g id="separator">=</xliff:g>Biškek<xliff:g id="timezone">|Asia/Bishkek</xliff:g></string>
+ <string name="C307">B<xliff:g id="separator">=</xliff:g>Bissau<xliff:g id="timezone">|Africa/Bissau</xliff:g></string>
+ <string name="C308">B<xliff:g id="separator">=</xliff:g>Bujumbura<xliff:g id="timezone">|Africa/Bujumbura</xliff:g></string>
+ <string name="C309">D<xliff:g id="separator">=</xliff:g>Dili<xliff:g id="timezone">|Asia/Dili</xliff:g></string>
+ <string name="C310">D<xliff:g id="separator">=</xliff:g>Dušanbe<xliff:g id="timezone">|Asia/Dushanbe</xliff:g></string>
+ <string name="C311">F<xliff:g id="separator">=</xliff:g>Funafuti<xliff:g id="timezone">|Pacific/Funafuti</xliff:g></string>
+ <string name="C312">H<xliff:g id="separator">=</xliff:g>Honiara<xliff:g id="timezone">|Pacific/Guadalcanal</xliff:g></string>
+ <string name="C313">J<xliff:g id="separator">=</xliff:g>Juba<xliff:g id="timezone">|Africa/Juba</xliff:g></string>
+ <string name="C314">K<xliff:g id="separator">=</xliff:g>Kingstown<xliff:g id="timezone">|America/St_Vincent</xliff:g></string>
+ <string name="C315">L<xliff:g id="separator">=</xliff:g>Libreville<xliff:g id="timezone">|Africa/Libreville</xliff:g></string>
+ <string name="C316">L<xliff:g id="separator">=</xliff:g>Lomé<xliff:g id="timezone">|Africa/Lome</xliff:g></string>
+ <string name="C317">L<xliff:g id="separator">=</xliff:g>Luanda<xliff:g id="timezone">|Africa/Luanda</xliff:g></string>
+ <string name="C318">L<xliff:g id="separator">=</xliff:g>Lusaka<xliff:g id="timezone">|Africa/Lusaka</xliff:g></string>
+ <string name="C319">M<xliff:g id="separator">=</xliff:g>Majuro<xliff:g id="timezone">|Pacific/Majuro</xliff:g></string>
+ <string name="C320">M<xliff:g id="separator">=</xliff:g>Malabo<xliff:g id="timezone">|Africa/Malabo</xliff:g></string>
+ <string name="C321">M<xliff:g id="separator">=</xliff:g>Maputo<xliff:g id="timezone">|Africa/Maputo</xliff:g></string>
+ <string name="C322">M<xliff:g id="separator">=</xliff:g>Mbabane<xliff:g id="timezone">|Africa/Mbabane</xliff:g></string>
+ <string name="C323">M<xliff:g id="separator">=</xliff:g>Moroni<xliff:g id="timezone">|Indian/Comoro</xliff:g></string>
+ <string name="C324">N<xliff:g id="separator">=</xliff:g>N’Djamena<xliff:g id="timezone">|Africa/Ndjamena</xliff:g></string>
+ <string name="C325">N<xliff:g id="separator">=</xliff:g>Ngerulmud<xliff:g id="timezone">|Pacific/Palau</xliff:g></string>
+ <string name="C326">N<xliff:g id="separator">=</xliff:g>Niamey<xliff:g id="timezone">|Africa/Niamey</xliff:g></string>
+ <string name="C327">N<xliff:g id="separator">=</xliff:g>Nicosia<xliff:g id="timezone">|Europe/Nicosia</xliff:g></string>
+ <string name="C328">N<xliff:g id="separator">=</xliff:g>Nouakchott<xliff:g id="timezone">|Africa/Nouakchott</xliff:g></string>
+ <string name="C329">N<xliff:g id="separator">=</xliff:g>Nuku’alofa<xliff:g id="timezone">|Pacific/Tongatapu</xliff:g></string>
+ <string name="C330">O<xliff:g id="separator">=</xliff:g>Ouagadougou<xliff:g id="timezone">|Africa/Ouagadougou</xliff:g></string>
+ <string name="C331">P<xliff:g id="separator">=</xliff:g>Palikir<xliff:g id="timezone">|Pacific/Noumea</xliff:g></string>
+ <string name="C332">P<xliff:g id="separator">=</xliff:g>Philipsburg<xliff:g id="timezone">|America/Lower_Princes</xliff:g></string>
+ <string name="C333">P<xliff:g id="separator">=</xliff:g>Podgorica<xliff:g id="timezone">|Europe/Podgorica</xliff:g></string>
+ <string name="C334">P<xliff:g id="separator">=</xliff:g>Port Moresby<xliff:g id="timezone">|Pacific/Palau</xliff:g></string>
+ <string name="C335">P<xliff:g id="separator">=</xliff:g>Port Vila<xliff:g id="timezone">|Pacific/Efate</xliff:g></string>
+ <string name="C336">P<xliff:g id="separator">=</xliff:g>Porto-Novo<xliff:g id="timezone">|Africa/Porto-Novo</xliff:g></string>
+ <string name="C337">P<xliff:g id="separator">=</xliff:g>Priština<xliff:g id="timezone">|Europe/Belgrade</xliff:g></string>
+ <string name="C338">R<xliff:g id="separator">=</xliff:g>Roseau<xliff:g id="timezone">|America/Dominica</xliff:g></string>
+ <string name="C339">T<xliff:g id="separator">=</xliff:g>Toškent<xliff:g id="timezone">|Asia/Tashkent</xliff:g></string>
+ <string name="C340">T<xliff:g id="separator">=</xliff:g>T’bilisi<xliff:g id="timezone">|Asia/Tbilisi</xliff:g></string>
+ <string name="C341">T<xliff:g id="separator">=</xliff:g>Thimphu<xliff:g id="timezone">|Asia/Thimphu</xliff:g></string>
+ <string name="C342">T<xliff:g id="separator">=</xliff:g>Tiranë<xliff:g id="timezone">|Europe/Tirane</xliff:g></string>
+ <string name="C343">V<xliff:g id="separator">=</xliff:g>Vaduz<xliff:g id="timezone">|Europe/Vaduz</xliff:g></string>
+ <string name="C344">V<xliff:g id="separator">=</xliff:g>Vientiane<xliff:g id="timezone">|Asia/Vientiane</xliff:g></string>
+ <string name="C345">W<xliff:g id="separator">=</xliff:g>Windhoek<xliff:g id="timezone">|Africa/Windhoek</xliff:g></string>
+ <string name="C346">Y<xliff:g id="separator">=</xliff:g>Yaoundé<xliff:g id="timezone">|Africa/Douala</xliff:g></string>
+ <string name="C347">Y<xliff:g id="separator">=</xliff:g>Sgìre Yaren<xliff:g id="timezone">|Pacific/Nauru</xliff:g></string>
+ <string name="C348">Y<xliff:g id="separator">=</xliff:g>Yerevan<xliff:g id="timezone">|Asia/Yerevan</xliff:g></string>
+</resources>
diff --git a/res/values-gd/cm_strings.xml b/res/values-gd/cm_strings.xml
new file mode 100644
index 0000000..e3bfabf
--- /dev/null
+++ b/res/values-gd/cm_strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Gnìomh flipeadh an uidheim</string>
+ <string name="shake_action_title">Gnìomh crathadh an uidheim</string>
+ <string-array name="action_setting_entries">
+ <item>Dèan dùsal</item>
+ <item>Leig seachad</item>
+ <item>Na dèan dad</item>
+ </string-array>
+</resources>
diff --git a/res/values-gd/strings.xml b/res/values-gd/strings.xml
new file mode 100644
index 0000000..b0b309b
--- /dev/null
+++ b/res/values-gd/strings.xml
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 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.
+ -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+ <string name="app_label">Cleoc</string>
+ <string name="label">Leubail</string>
+ <string name="default_label">Caismeachd</string>
+ <string name="alarm_vibrate">Dèan crith</string>
+ <string name="alarm_repeat">A-rithist</string>
+ <string name="delete">Sguab às</string>
+ <string name="default_timer_ringtone_title">Falbhaidh an ùine air an tìmear</string>
+ <string name="alarm_tomorrow">A-màireach</string>
+ <string name="alarm_today">An-diugh</string>
+ <string name="alarm_alert_dismiss_text">Leig seachad</string>
+ <string name="alarm_missed_title">Caismeachd a dh’fhalbh ort</string>
+ <string name="alarm_alert_snoozed_text">Na dhùsal</string>
+ <plurals name="alarm_alert_snooze_duration">
+ <item quantity="one"><xliff:g id="number" example="7">%d</xliff:g> mhion</item>
+ <item quantity="two"><xliff:g id="number" example="7">%d</xliff:g> mhion</item>
+ <item quantity="few"><xliff:g id="number" example="7">%d</xliff:g> mion</item>
+ <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> mion</item>
+ </plurals>
+ <string name="alarm_alert_off_text">Tha a’ chaismeachd dheth</string>
+ <string name="alarm_alert_snooze_text">Dèan dùsal</string>
+ <plurals name="alarm_alert_snooze_set">
+ <item quantity="one">’Na dhùsal fad <xliff:g id="minutes">%d</xliff:g> mhionaid.</item>
+ <item quantity="two">’Na dhùsal fad <xliff:g id="minutes">%d</xliff:g> mhionaid.</item>
+ <item quantity="few">’Na dhùsal fad <xliff:g id="minutes">%d</xliff:g> mionaidean.</item>
+ <item quantity="other">’Na dhùsal fad <xliff:g id="minutes">%d</xliff:g> mionaid.</item>
+ </plurals>
+ <string name="alarm_alert_snooze_until">’Na dhùsal gus <xliff:g id="time">%s</xliff:g></string>
+ <string name="alarm_alert_predismiss_title">Tha caismeachd gu bhith ann</string>
+ <string name="missed_alarm_has_been_deleted">Chaidh a’ chaismeachd a dh’fhalbh ort a sguabadh às</string>
+ <string name="timer_notifications_less_min">Nas lugha na mionaid air fhàgail</string>
+ <string name="timer_notifications_hours"><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"><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_remaining_single">air fhàgail</string>
+ <string name="timer_remaining_multiple">air fhàgail</string>
+ <string-array name="alarm_set">
+ <item>Gheibh thu caismeachd am broinn mionaid.</item>
+ <item>Gheibh thu caismeachd an ceann <xliff:g id="DAYS" example="2 days">%1$s</xliff:g>.</item>
+ <item>Gheibh thu caismeachd an ceann <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g>.</item>
+ <item>Gheibh thu caismeachd an ceann <xliff:g id="DAYS" example="2 days">%1$s</xliff:g> ’s <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g>.</item>
+ <item>Gheibh thu caismeachd an ceann <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g>.</item>
+ <item>Gheibh thu caismeachd an ceann <xliff:g id="DAYS" example="2 days">%1$s</xliff:g> ’s <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g>.</item>
+ <item>Gheibh thu caismeachd an ceann <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g> ’s <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g>.</item>
+ <item>Gheibh thu caismeachd <xliff:g id="DAYS" example="2 days">%1$s</xliff:g>, <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g> ’s <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g>.</item>
+ </string-array>
+ <plurals name="days">
+ <item quantity="one"><xliff:g id="number" example="7">%s</xliff:g> latha</item>
+ <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> latha</item>
+ <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> làithean</item>
+ <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> latha</item>
+ </plurals>
+ <plurals name="hours">
+ <item quantity="one"><xliff:g id="number" example="7">%s</xliff:g> uair a thìde</item>
+ <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> uair a thìde</item>
+ <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> uairean a thìde</item>
+ <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> uair a thìde</item>
+ </plurals>
+ <plurals name="minutes">
+ <item quantity="one"><xliff:g id="number" example="7">%s</xliff:g> mhionaid</item>
+ <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> mhionaid</item>
+ <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> mionaidean</item>
+ <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> mionaid</item>
+ </plurals>
+ <string name="every_day">Gach latha</string>
+ <string name="day_concat">", "</string>
+ <string name="loading_widget">’Ga luchdadh\u2026</string>
+ <string name="analog_gadget">Cleoc analogach</string>
+ <string name="digital_gadget">Cleoc digiteach</string>
+ <string name="settings">Roghainnean</string>
+ <string name="snooze_duration_title">Dèan dùsal fad</string>
+ <string name="crescendo_duration_title">Àrdaich an fuaim mean air mhean</string>
+ <string name="auto_silence_title">Cuir ’na thost às dèidh </string>
+ <plurals name="auto_silence_summary">
+ <item quantity="one"><xliff:g id="number" example="7">%s</xliff:g> mhionaid</item>
+ <item quantity="two"><xliff:g id="formatted_number" example="7">%s</xliff:g> mhionaid</item>
+ <item quantity="few"><xliff:g id="formatted_number" example="7">%s</xliff:g> mionaidean</item>
+ <item quantity="other"><xliff:g id="formatted_number" example="7">%s</xliff:g> mionaid</item>
+ </plurals>
+ <string name="auto_silence_never">Chan ann idir</string>
+ <string-array name="auto_silence_entries">
+ <item>Mionaid</item>
+ <item>5 mionaidean</item>
+ <item>10 mionaidean</item>
+ <item>10 mionaidean</item>
+ <item>20 mionaid</item>
+ <item>25 mionaid</item>
+ <item>Chan ann idir</item>
+ </string-array>
+ <string-array name="crescendo_entries">
+ <item>Dheth</item>
+ <item>5 seconds</item>
+ <item>10 seconds</item>
+ <item>15 seconds</item>
+ <item>20 seconds</item>
+ <item>25 seconds</item>
+ <item>30 seconds</item>
+ <item>35 seconds</item>
+ <item>40 seconds</item>
+ <item>45 seconds</item>
+ <item>50 seconds</item>
+ <item>55 seconds</item>
+ <item>60 seconds</item>
+ </string-array>
+ <string-array name="snooze_duration_entries">
+ <item>Mionaid</item>
+ <item>2 minutes</item>
+ <item>3 minutes</item>
+ <item>4 minutes</item>
+ <item>5 mionaidean</item>
+ <item>6 minutes</item>
+ <item>7 minutes</item>
+ <item>8 minutes</item>
+ <item>9 minutes</item>
+ <item>10 mionaidean</item>
+ <item>11 minutes</item>
+ <item>12 minutes</item>
+ <item>13 minutes</item>
+ <item>14 minutes</item>
+ <item>10 mionaidean</item>
+ <item>16 minutes</item>
+ <item>17 minutes</item>
+ <item>18 minutes</item>
+ <item>19 minutes</item>
+ <item>20 mionaid</item>
+ <item>21 minutes</item>
+ <item>22 minutes</item>
+ <item>23 minutes</item>
+ <item>24 minutes</item>
+ <item>25 mionaid</item>
+ <item>26 minutes</item>
+ <item>27 minutes</item>
+ <item>28 minutes</item>
+ <item>29 minutes</item>
+ <item>30 minutes</item>
+ </string-array>
+ <string name="week_start_title">Tòisich an t-seachdain air</string>
+ <string-array name="week_start_entries">
+ <item>DiSathairne</item>
+ <item>DiDòmhnaich</item>
+ <item>DiLuain</item>
+ </string-array>
+ <string name="alarm_volume_title">Àirde fuaim nan caismeachdan</string>
+ <string name="silent_ringtone_title">’Na thost</string>
+ <string name="unknown_ringtone_title">Chan eil fhios</string>
+ <string name="volume_button_setting_title">Putain àirde na fuaime</string>
+ <string-array name="volume_button_setting_entries">
+ <item>Dèan dùsal</item>
+ <item>Leig seachad</item>
+ <item>Control volume</item>
+ </string-array>
+ <string name="label_description">Leubail</string>
+ <string name="ringtone_description">Seirm</string>
+ <string name="menu_alarm">Caismeachd</string>
+ <string name="menu_timer">Tìmear</string>
+ <string name="menu_clock">Cleoc</string>
+ <string name="menu_stopwatch">Stad-uaireadair</string>
+ <string name="button_alarms">Cuir caismeachd ris</string>
+ <string name="button_cities">Bailtean</string>
+ <string name="menu_item_settings">Roghainnean</string>
+ <string name="menu_item_help">Cobhair</string>
+ <string name="menu_item_sort_by_gmt_offset">Seòrsaich a-rèir an ama</string>
+ <string name="menu_item_sort_by_name">Seòrsaich a-rèir ainm</string>
+ <string name="selected_cities_label">Na bailtean a thagh thu</string>
+ <string name="sw_resume_button">Lean air</string>
+ <string name="sw_reset_button">Ath-shuidhich</string>
+ <string name="sw_start_button">Tòisich</string>
+ <string name="sw_pause_button">Cuir ’na stad</string>
+ <string name="sw_lap_button">Cuairt</string>
+ <string name="sw_share_button">Co-roinn</string>
+ <string name="hours_label">u</string>
+ <string name="minutes_label">m</string>
+ <string name="seconds_label">d</string>
+ <string name="sw_share_main">Thug mi <xliff:g id="time">%s</xliff:g></string>
+ <string name="sw_share_laps">Ùineachan cuairte:</string>
+ <string name="sw_notification_lap_number">Cuairt <xliff:g id="number">%d</xliff:g></string>
+ <string name="timer_add_timer">Cuir tìmear ris</string>
+ <string name="timer_start">Tòisich</string>
+ <string name="timer_delete">Sguab às</string>
+ <string name="timer_descriptive_delete">Sguab às <xliff:g id="number_string">%s</xliff:g></string>
+ <string name="timer_plus_one">Cuir mionaid ris</string>
+ <string name="timer_plus_1_min">Cuir mionaid ris</string>
+ <string name="timer_stop">Cuir stad air</string>
+ <string name="timer_stop_all">Cuir stad air gach tìmear</string>
+ <string name="timer_reset">Ath-shuidhich</string>
+ <string name="timer_cancel">Sguir dheth</string>
+ <string name="timer_canceled">Chaidh sgur dhen tìmear</string>
+ <string name="timer_times_up">Tha an ùine seachad</string>
+ <string name="timer_multi_times_up">Dh’fhalbh an ùine air tìmearan (<xliff:g id="NUM_TIMERS" example="2">%d</xliff:g>)</string>
+ <string name="timer_notification_label">Tìmear</string>
+ <string name="timer_pause">Cuir ’na stad</string>
+ <string name="timer_reset_all">Ath-shuidhich gach tìmear</string>
+ <string-array name="sw_share_strings" translatable="true">
+ <item>Nach tusa a tha luath!</item>
+ <item>Meal d’ obair.</item>
+ <item>Ruigidh each mall muileann.</item>
+ <item>Murt!</item>
+ <item>Cuairt luath.</item>
+ <item>Nach luath sin?</item>
+ <item>A’ falbh leis a’ ghaoth.</item>
+ <item>Làrach nam bonn.</item>
+ <item>Nach ortsa a tha a’ chabhag!</item>
+ <item>Cho luath ri geàrr.</item>
+ </string-array>
+ <string name="home_label">Dachaigh</string>
+ <string name="cities_activity_title">Bailtean</string>
+ <string name="clock_settings">Cleoc</string>
+ <string name="clock_style">Stoidhle</string>
+ <string-array name="clock_style_entries">
+ <item>Analogach</item>
+ <item>Digiteach</item>
+ </string-array>
+ <string name="automatic_home_clock">Cleoc dachaigh fèin-obrachail</string>
+ <string name="automatic_home_clock_summary">Nuair a bhios mi a’ siubhal am badeigin far a bheil an t-àm eadar-dhealaichte, cuir ris cleoc mo dhachaigh</string>
+ <string name="home_time_zone">Roinn-tìde na dachaigh</string>
+ <string name="home_time_zone_title">Roinn-tìde na dachaigh</string>
+ <string name="city_checked">Chaidh <xliff:g id="city_name">%s</xliff:g> a thaghadh</string>
+ <string name="city_unchecked">Cha deach <xliff:g id="city_name">%s</xliff:g> a thaghadh</string>
+ <string-array name="timezone_labels" tools:ignore="Typos">
+ <item>"Eileanan Mharshall"</item>
+ <item>"Eilean Midway"</item>
+ <item>"Na h-Eileanan Hawai’i"</item>
+ <item>"Alaska"</item>
+ <item>"Àm a’ Chuain Sèimh"</item>
+ <item>"Tijuana"</item>
+ <item>"Arizona"</item>
+ <item>"Chihuahua"</item>
+ <item>"Àm Monaidh"</item>
+ <item>"Meadhan-Aimeireaga"</item>
+ <item>"Àm Meadhain"</item>
+ <item>"Cathair Mheagsago"</item>
+ <item>"Saskatchewan"</item>
+ <item>"Bogotá"</item>
+ <item>"Àm an Ear"</item>
+ <item>"A’ Bheiniseala"</item>
+ <item>"Àm a’ Chuain Siar (Barbados)"</item>
+ <item>"Àm a’ Chuain Siar (Canada)"</item>
+ <item>"Manaus"</item>
+ <item>"Santiago"</item>
+ <item>"Talamh an Èisg"</item>
+ <item>"Brasília"</item>
+ <item>"Buenos Aires"</item>
+ <item>"A’ Ghraonlann"</item>
+ <item>"Montevideo"</item>
+ <item>"Meadhan a’ Chuain Siar"</item>
+ <item>"Na h-Eileanan Asorach"</item>
+ <item>"Eileanan a’ Chip Uaine"</item>
+ <item>"Casablanca"</item>
+ <item>"Lunnainn, Dùn Èideann"</item>
+ <item>"Amsterdam, Berlin"</item>
+ <item>"Beograd"</item>
+ <item>"A’ Bhruiseal"</item>
+ <item>"Sarajevo"</item>
+ <item>"Windhoek"</item>
+ <item>"Taobh an Iar Meadhan-Afraga"</item>
+ <item>"Amman, Iòrdan"</item>
+ <item>"Baile na h‑Àithne, İstanbul"</item>
+ <item>"Beirut, Leabanon"</item>
+ <item>"Cairo"</item>
+ <item>"Helsinki"</item>
+ <item>"Ierusalam"</item>
+ <item>"Minsk"</item>
+ <item>"Harare"</item>
+ <item>"Baghdad"</item>
+ <item>"Mosgo"</item>
+ <item>"Cuibhèit"</item>
+ <item>"Nairobi"</item>
+ <item>"Tehrān"</item>
+ <item>"Baku"</item>
+ <item>"T’bilisi"</item>
+ <item>"Yerevan"</item>
+ <item>"Dubai"</item>
+ <item>"Kabul"</item>
+ <item>"Islamabad, Karachi"</item>
+ <item>"Ural’sk"</item>
+ <item>"Yekaterinburg"</item>
+ <item>"Kolkata"</item>
+ <item>"Sri Lanca"</item>
+ <item>"Kathmandu"</item>
+ <item>"Astana"</item>
+ <item>"Yangon"</item>
+ <item>"Krasnoyarsk"</item>
+ <item>"Bangkok"</item>
+ <item>"Beijing"</item>
+ <item>"Hong Kong"</item>
+ <item>"Irkutsk"</item>
+ <item>"Kuala Lumpur"</item>
+ <item>"Peairt"</item>
+ <item>"Taipei"</item>
+ <item>"Seoul"</item>
+ <item>"Tōkyō, Ōsaka"</item>
+ <item>"Yakutsk"</item>
+ <item>"Adelaide"</item>
+ <item>"Darwin"</item>
+ <item>"Brisbane"</item>
+ <item>"Hobart"</item>
+ <item>"Sidni, Canberra"</item>
+ <item>"Vladivostok"</item>
+ <item>"Guam"</item>
+ <item>"Magadan"</item>
+ <item>"Auckland"</item>
+ <item>"Fìdi"</item>
+ <item>"Tonga"</item>
+ <item>"Jakarta"</item>
+ </string-array>
+ <string name="shortcut_start_stopwatch_short">Tòisich</string>
+ <string name="shortcut_pause_stopwatch_short">Cuir ’na stad</string>
+ <string name="alarm_settings">Caismeachdan</string>
+ <string name="timer_service_desc">Dèilig ri gnìomhan o bhrathan tìmeir.</string>
+ <string name="stopwatch_service_desc">Dèilig ri gnìomhan o bhrathan stad-uaireadair.</string>
+ <string name="swn_paused">’Na stad</string>
+ <string name="description_direction_right">Dèan grad-shlaighdeadh gun taobh deas ’ga leigeil seachad</string>
+ <string name="description_direction_left">Grad-shlaighd gun taobh chlì ’ga chur ’na dhùsal</string>
+ <string name="description_direction_both">Grad-shlaighd gun taobh chlì ’ga chur ’na dhùsal no gun taobh deas ’ga leigeil seachad</string>
+ <string name="timer_settings">Tìmearan</string>
+ <string name="timer_paused">Tha an tìmear ’na stad</string>
+ <string name="timers_stopped">Tha na tìmearan (<xliff:g id="number" example="7">%d</xliff:g>) ’nan stad</string>
+ <string name="timers_in_use"><xliff:g id="number" example="7">%d</xliff:g> tìmear(an)</string>
+ <string name="next_timer_notif">An t-ath-thìmear: <xliff:g id="time_remaining" example="2 minutes remaining">%s</xliff:g></string>
+ <string name="night_mode_title">Am modh oidhche</string>
+ <string name="night_mode_summary">Sgrìn ghlè fhann (do sheòmraichean dorcha)</string>
+ <string name="expand_alarm">Leudaich a’ chaismeachd</string>
+ <string name="collapse_alarm">Co-theannaich a’ chaismeachd</string>
+ <string name="alarm_undo">neo-dhèan</string>
+ <string name="alarm_deleted">Chaidh a’ chaismeachd a sguabadh às</string>
+ <string name="world_day_of_week_label"> / <xliff:g id="label">%s</xliff:g></string>
+ <string name="world_tomorrow">A-màireach</string>
+ <string name="next_alarm_description">An ath-chaismeachd: <xliff:g id="alarm_time" example="Wed 8:00am">%s</xliff:g></string>
+ <string name="no_alarms">Chan eil caismeachd ann</string>
+ <string name="no_scheduled_alarms">Chan eil caismeachd air an sgeideal</string>
+ <string name="no_label_specified">Cha deach leubail a shònrachadh</string>
+ <string name="no_alarms_with_label">Chan eil caismeachd air a bheil an leubail seo</string>
+ <string name="no_alarm_scheduled_for_this_time">Chan eil caismeachd air an sgeideal airson an ama seo</string>
+ <string name="alarm_is_dismissed">Chaidh caismeachd aig <xliff:g id="alarm_time" example="14:20">%s</xliff:g> a leigeil seachad</string>
+ <string name="alarm_is_set">Chaidh caismeachd a shuidheachadh aig <xliff:g id="alarm_time" example="14:20">%s</xliff:g></string>
+ <string name="timer_created">Chaidh tìmear a chruthachadh</string>
+ <plurals name="expired_timers_dismissed">
+ <item quantity="one">Chaidh <xliff:g id="number" example="5">%d</xliff:g> tìmear a leigeil seachad</item>
+ <item quantity="two">Chaidh <xliff:g id="number" example="5">%d</xliff:g> thìmear a leigeil seachad</item>
+ <item quantity="few">Chaidh <xliff:g id="number" example="5">%d</xliff:g> tìmearan a leigeil seachad</item>
+ <item quantity="other">Chaidh <xliff:g id="number" example="5">%d</xliff:g> tìmear a leigeil seachad</item>
+ </plurals>
+ <string name="timer_deleted">Chaidh an tìmear a sguabadh às</string>
+ <string name="invalid_timer_length">Seo faide mhì-dhligheach do thìmear</string>
+ <string name="invalid_timer">Chaidh tìmear mì-dhligheach a thaghadh.</string>
+ <string name="no_expired_timers">Cha do dh’fhalbh an ùine air tìmear sam bith</string>
+ <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away">Cha ghabh a’ chaismeachd aig <xliff:g id="alarm_time" example="14:20">%s</xliff:g> a leigeil seachad fhathast, tha i còrr is 24 uair a thìde romhad</string>
+ <string name="dismiss_alarm">Leig seachad a’ chaismeachd</string>
+ <string name="pick_alarm_to_dismiss">Tagh dè a’ chaismeachd a leigeas tu seachad</string>
+ <string name="no_firing_alarms">Chan eil caismeachd ghnìomhach ann</string>
+ <string name="alarm_is_snoozed">Chaidh a’ chaismeachd aig <xliff:g id="alarm_time" example="14:20">%s</xliff:g> a chur ’na dùsal fad 10 mionaidean</string>
+</resources>
diff --git a/res/values-gl/cm_strings.xml b/res/values-gl/cm_strings.xml
new file mode 100644
index 0000000..e2d9d25
--- /dev/null
+++ b/res/values-gl/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Acción ao voltear o dispositivo</string>
+ <string name="shake_action_title">Acción ao axitar o dispositivo</string>
+ <string-array name="action_setting_entries">
+ <item>Adiar</item>
+ <item>Rexeitar</item>
+ <item>Nada</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Activación de alarmas e temporizadores</string>
+ <string name="alarm_missed_channel">Alarmas perdidas</string>
+ <string name="alarm_snooze_channel">Adiadas alarmas</string>
+ <string name="alarm_upcoming_channel">Próximas alarmas</string>
+ <string name="stopwatch_channel">Cronómetro</string>
+ <string name="timer_channel">Temporizador</string>
+</resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 075eef5..e654742 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Hoxe"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Apagar"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarma perdida"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Adiada"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutos</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Temporizador perdido: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pausa"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Restablecer todo"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 8511cdd..eeedd7f 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> મિનિટ</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ચૂકી ગયેલ ટાઇમર: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"થોભાવો"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"બધા ટાઇમર્સ ફરીથી સેટ કરો"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 3fde38c..f3f9e57 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> मिनट</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"छूटा हुआ टाइमर: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"रोकें"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"सभी टाइमर रीसेट करें"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
new file mode 100644
index 0000000..83de2aa
--- /dev/null
+++ b/res/values-hr/cm_strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Radnja okretanja uređaja</string>
+ <string name="shake_action_title">Radnja tresenja uređaja</string>
+ <string-array name="action_setting_entries">
+ <item>Odgodi</item>
+ <item>Odbaci</item>
+ <item>Ništa</item>
+ </string-array>
+</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 6ec4b34..3adbf6e 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Danas"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Odbaci"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Propušteni alarm"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Odgođeno"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -248,8 +248,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Propušteni tajmer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pauziraj"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Poništi tajmere"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
new file mode 100644
index 0000000..7e6a0d2
--- /dev/null
+++ b/res/values-hu/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Készülék-megfordítással kiváltott művelet</string>
+ <string name="shake_action_title">Készülék-megrázással kiváltott művelet</string>
+ <string-array name="action_setting_entries">
+ <item>Elhalasztás (Szundi)</item>
+ <item>Elvetés</item>
+ <item>Semmi</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Elévülő értesítések és időzítők</string>
+ <string name="alarm_missed_channel">Elmulasztott ébresztők</string>
+ <string name="alarm_snooze_channel">Elhalasztott ébresztők</string>
+ <string name="alarm_upcoming_channel">Következő ébresztések</string>
+ <string name="stopwatch_channel">Stopperóra</string>
+ <string name="timer_channel">Időzítő</string>
+</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 673f1ea..228c9e8 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Ma"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Elvetés"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Elmulasztott ébresztő"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Szundi"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> perc</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Elmulasztott időzítő: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Szüneteltetés"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Visszaállítás"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 19dac8f..df668da 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> րոպե</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Բաց թողնված ժամաչափ՝ <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Դադարեցնել"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Վերակայել բոլոր ժամաչափերը"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
new file mode 100644
index 0000000..d50e356
--- /dev/null
+++ b/res/values-in/cm_strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Tindakan membalik perangkat</string>
+ <string name="shake_action_title">Tindakan menggoyangkan perangkat</string>
+ <string-array name="action_setting_entries">
+ <item>Tunda</item>
+ <item>Tutup</item>
+ <item>Tidak ada</item>
+ </string-array>
+ <string name="alarm_missed_channel">Alarm yang terlewat</string>
+ <string name="alarm_snooze_channel">Alarm yang ditunda</string>
+ <string name="stopwatch_channel">Stopwatch</string>
+ <string name="timer_channel">Timer</string>
+</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c6b0692..259d31d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Hari ini"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Tutup"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarm yang terlewat"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Ditunda"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> mnt</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Timer terlewat: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Jeda"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Setel ulang semua pewaktu"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>.<xliff:g id="MINUTES">%02d</xliff:g>.<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>.<xliff:g id="SECONDS">%02d</xliff:g>"</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>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index d76e48b..c65c412 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Í dag"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Hunsa"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Hunsaður vekjari"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Blundað"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> mín.</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Ekki á réttum tíma: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Gera hlé"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Núlla teljara"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
new file mode 100644
index 0000000..1d4db2d
--- /dev/null
+++ b/res/values-it/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Azione capovolgimento</string>
+ <string name="shake_action_title">Azione scuotimento</string>
+ <string-array name="action_setting_entries">
+ <item>Posticipa</item>
+ <item>Spegni</item>
+ <item>Niente</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Sveglie & timer</string>
+ <string name="alarm_missed_channel">Sveglie perse</string>
+ <string name="alarm_snooze_channel">Sveglie silenziate</string>
+ <string name="alarm_upcoming_channel">Prossime sveglie</string>
+ <string name="stopwatch_channel">Cronometro</string>
+ <string name="timer_channel">Timer</string>
+</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3b9f1dc..2b0d75b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Oggi"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Spegni"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Sveglia ignorata"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Timer perso: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pausa"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Reimposta tutti i timer"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
new file mode 100644
index 0000000..2cf83c9
--- /dev/null
+++ b/res/values-iw/cm_strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">פעולת הפיכת המכשיר</string>
+ <string name="shake_action_title">פעולת ניעור המכשיר</string>
+ <string-array name="action_setting_entries">
+ <item>נודניק</item>
+ <item>דחה</item>
+ <item>שום דבר</item>
+ </string-array>
+</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index e668b71..4664b1f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="two"><xliff:g id="NUMBER">%d</xliff:g> דקות</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"התראות טיימר שהחמצת: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"השהה"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"אפס את הטיימרים"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
new file mode 100644
index 0000000..f5bc5b7
--- /dev/null
+++ b/res/values-ja/cm_strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">端末反転アクション</string>
+ <string name="shake_action_title">端末を振った時の動作</string>
+ <string-array name="action_setting_entries">
+ <item>スヌーズ</item>
+ <item>閉じる</item>
+ <item>なし</item>
+ </string-array>
+</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 8c3f66f..f57f4de 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g>分</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"未応答のタイマー: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"一時停止"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"全タイマーをリセット"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-ka/cm_strings.xml b/res/values-ka/cm_strings.xml
new file mode 100644
index 0000000..836d87a
--- /dev/null
+++ b/res/values-ka/cm_strings.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">მოქმედება მოწყობილობის შეტრიალებისას</string>
+ <string-array name="action_setting_entries">
+ <item>გადადება</item>
+ <item>გაუქმება</item>
+ <item>არაფერი</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">საგანგებო სიგნალები და წამზომები</string>
+ <string name="alarm_missed_channel">გაცდენილი მაღვიძარა</string>
+ <string name="alarm_snooze_channel">გადადებული მაღვიძარა</string>
+ <string name="alarm_upcoming_channel">მომავალი მაღვიძარა</string>
+ <string name="stopwatch_channel">წამზომი</string>
+ <string name="timer_channel">უკუმთვლელი</string>
+</resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 2874ab5..512283d 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> წთ</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"გამოტოვებული ტაიმერი: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"პაუზა"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"ტაიმერებ.ჩამოყრა"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 9c5b8fc..2892a5b 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> мин</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Өткізілген таймер: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Кідірту"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Барлық таймерлерді ысыру"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index bc64734..a5359a6 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> នាទី</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"កម្មវិធីកំណត់ពេលដែលខកខាន៖ <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"ផ្អាក"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"កំណត់ការកំណត់ពេលទាំងអស់ឡើងវិញ"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-kn/cm_strings.xml b/res/values-kn/cm_strings.xml
new file mode 100644
index 0000000..5297449
--- /dev/null
+++ b/res/values-kn/cm_strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">ಸಾಧನದ ಮಗುಚು ಕ್ರಿಯೆ</string>
+ <string name="shake_action_title">ಸಾಧನದ ಕುಲುಕು ಕ್ರಿಯೆ</string>
+ <string-array name="action_setting_entries">
+ <item>ಲಘುನಿದ್ದೆ</item>
+ <item>ವಜಾಮಾಡು</item>
+ <item>ಏನಿಲ್ಲ</item>
+ </string-array>
+</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 834ca98..480cb66 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ನಿಮಿಷ</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ತಪ್ಪಿದ ಟೈಮರ್: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"ವಿರಾಮ"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"ಎಲ್ಲಾ ಟೈಮರ್ ಮರುಹೊಂದಿಸಿ"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
new file mode 100644
index 0000000..cdae3a8
--- /dev/null
+++ b/res/values-ko/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">기기 뒤집을 때 동작</string>
+ <string name="shake_action_title">기기 흔들 때 동작</string>
+ <string-array name="action_setting_entries">
+ <item>알람 일시 정지</item>
+ <item>알람 해제</item>
+ <item>사용 안 함</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">알람 및 타이머 시작</string>
+ <string name="alarm_missed_channel">부재 중 알람</string>
+ <string name="alarm_snooze_channel">일시 중지된 알람</string>
+ <string name="alarm_upcoming_channel">예정된 알람</string>
+ <string name="stopwatch_channel">스톱워치</string>
+ <string name="timer_channel">타이머</string>
+</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 61319de..56db6b7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g>분</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"부재중 타이머: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"일시중지"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"모든 타이머 재설정"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
new file mode 100644
index 0000000..ceb9e48
--- /dev/null
+++ b/res/values-ku/strings.xml
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 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.
+ -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+ <string name="app_label">کاتژمێر</string>
+ <string name="label">پێناس</string>
+ <string name="default_label">وریاکەرەوە</string>
+ <string name="alarm_vibrate">لەرزین</string>
+ <string name="alarm_repeat">دوبارەکردنەوە</string>
+ <string name="delete">سڕینهوه</string>
+ <string name="alarm_alert_dismiss_text">لابردن</string>
+ <string name="alarm_missed_title">ئاگادارکهرهوهی ونبوو</string>
+ <string name="alarm_alert_snooze_text">سووکه نوستن</string>
+ <plurals name="alarm_alert_snooze_set">
+ <item quantity="one">سوکهنوستن بۆ یهک خولهک.</item>
+ <item quantity="other">سوکه نوستن بۆ <xliff:g id="minutes">%d</xliff:g> خولهک.</item>
+ </plurals>
+ <string name="alarm_alert_snooze_until">سووکه نوستن تا <xliff:g id="time">%s</xliff:g></string>
+ <string name="alarm_alert_predismiss_title">ئاگادارکهرهوهی بهڕێگا</string>
+ <string name="missed_alarm_has_been_deleted">ئاگادارکهرهوهی ونبوو سڕدرایهوه</string>
+ <string name="timer_notifications_less_min">کهمتر له یهک خولهکی ماوه</string>
+ <string-array name="alarm_set">
+ <item>ئاگادارکهرهوه دانرا بۆ کهمتر له یهک خولهک له ئێستاوه.</item>
+ <item>ئاگادارکهرهوه دانرا بۆ <xliff:g id="DAYS" example="2 days">%1$s</xliff:g> له ئێستاوه.</item>
+ <item>ئاگادارکهرهوه دانرا بۆ <xliff:g id="DAYS" example="2 days">%2$s</xliff:g> له ئێستاوه.</item>
+ <item>ئاگادارکهرهوه دانرا بۆ <xliff:g id="DAYS" example="2 days">%1$s</xliff:g> وه <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g> له ئێستاوه.</item>
+ <item>ئاگادارکهرهوه دانرا بۆ <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> له ئێستاوه.</item>
+ <item>ئاگادارکهرهوه دانرا بۆ <xliff:g id="DAYS" example="2 days">%1$s</xliff:g> وه <xliff:g id="HOURS" example="2 hours">%3$s</xliff:g> له ئێستاوه.</item>
+ <item>ئاگادارکهرهوه دانرا بۆ <xliff:g id="DAYS" example="2 days">%2$s</xliff:g> وه <xliff:g id="HOURS" example="2 hours">%3$s</xliff:g> له ئێستاوه.</item>
+ <item>ئاگادارکهرهوه دانرا بۆ <xliff:g id="DAYS" example="2 days">%1$s</xliff:g>, <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g>, وه <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> له ئێستاوه.</item>
+ </string-array>
+ <string name="every_day">ههموو ڕۆژێک</string>
+ <string name="day_concat">", "</string>
+ <string name="analog_gadget">کاتژمێر پێوهری</string>
+ <string name="digital_gadget">کاتژمێر ژمارهیی</string>
+ <string name="settings">ڕێکخستنهکان</string>
+ <string name="snooze_duration_title">ماوهی سووکهنوستن</string>
+ <string name="auto_silence_title">بێدهنگ کردن دوای</string>
+ <string name="auto_silence_never">هەرگیز</string>
+ <string-array name="auto_silence_entries">
+ <item>1 minute</item>
+ <item>5 minutes</item>
+ <item>10 minutes</item>
+ <item>15 minutes</item>
+ <item>20 minutes</item>
+ <item>25 minutes</item>
+ <item>هیچکات</item>
+ </string-array>
+ <string-array name="snooze_duration_entries">
+ <item>1 minute</item>
+ <item>2 minutes</item>
+ <item>3 minutes</item>
+ <item>4 minutes</item>
+ <item>5 minutes</item>
+ <item>6 minutes</item>
+ <item>7 minutes</item>
+ <item>8 minutes</item>
+ <item>9 minutes</item>
+ <item>10 minutes</item>
+ <item>11 minutes</item>
+ <item>12 minutes</item>
+ <item>13 minutes</item>
+ <item>14 minutes</item>
+ <item>15 minutes</item>
+ <item>16 minutes</item>
+ <item>17 minutes</item>
+ <item>18 minutes</item>
+ <item>19 minutes</item>
+ <item>20 minutes</item>
+ <item>21 minutes</item>
+ <item>22 minutes</item>
+ <item>23 minutes</item>
+ <item>24 minutes</item>
+ <item>25 minutes</item>
+ <item>26 minutes</item>
+ <item>27 minutes</item>
+ <item>28 minutes</item>
+ <item>29 minutes</item>
+ <item>30 minutes</item>
+ </string-array>
+ <string name="alarm_volume_title">ئاستی دەنگی ئاگادارکەرەوە</string>
+ <string name="silent_ringtone_title">بێدەنگ</string>
+ <string name="volume_button_setting_title">دوگمەی دەنگ</string>
+ <string-array name="volume_button_setting_entries">
+ <item>سووکه نوستن</item>
+ <item>گوێ نەدان</item>
+ <item>Control volume</item>
+ </string-array>
+ <string name="label_description">پێناس</string>
+ <string name="ringtone_description">زهنگ</string>
+ <string name="menu_alarm">وریاکەرەوە</string>
+ <string name="menu_timer">کاتپێو</string>
+ <string name="menu_clock">کاتژمێر</string>
+ <string name="menu_stopwatch">کات وهستێن</string>
+ <string name="button_cities">شارهکان</string>
+ <string name="menu_item_settings">ڕێکخستنهکان</string>
+ <string name="menu_item_help">یارمەتی</string>
+ <string name="menu_item_sort_by_gmt_offset">ڕیزکردن بهپێی کات</string>
+ <string name="menu_item_sort_by_name">ڕیزکردن به ناو</string>
+ <string name="selected_cities_label">شاره دیاریکراوهکان</string>
+ <string name="sw_resume_button">دەستپێکردنەوە</string>
+ <string name="sw_reset_button">ڕێکخستنەوە</string>
+ <string name="sw_start_button">دەستپێکردن</string>
+ <string name="sw_lap_button">سوڕ</string>
+ <string name="sw_share_button">بهشداریپێکردن</string>
+ <string name="hours_label">ک</string>
+ <string name="minutes_label">خ</string>
+ <string name="seconds_label">چ</string>
+ <string name="sw_share_main">کاتی من بریتییه له <xliff:g id="time">%s</xliff:g></string>
+ <string name="sw_share_laps">ماوهی سوڕ:</string>
+ <string name="sw_notification_lap_number">سوڕی <xliff:g id="number">%d</xliff:g></string>
+ <string name="timer_add_timer">دیاریکردنی کاتپێو</string>
+ <string name="timer_start">دەستپێکردن</string>
+ <string name="timer_delete">سڕینهوه</string>
+ <string name="timer_plus_one">زیادکردنی یهک خولهک</string>
+ <string name="timer_plus_1_min">زیاد کردنی ۱ خولهک</string>
+ <string name="timer_stop">وهستاندن</string>
+ <string name="timer_reset">ڕێکخستنەوە</string>
+ <string name="timer_cancel">هەڵوەشاندنەوە</string>
+ <string name="timer_times_up">کات تهواو بوو</string>
+ <string name="timer_notification_label">کاتپێو</string>
+ <string-array name="sw_share_strings" translatable="true">
+ <item>تۆ خێرایی زۆر بهرزت بێدهنگ کرد.</item>
+ <item>دڵخۆشبه به بهری کارهکهت.</item>
+ <item>ئهندرۆید بهوه ناسراوه خێرایه ، بهس وهک تۆ نا !</item>
+ <item>فیو.!</item>
+ <item>کاتهکانی لێت.</item>
+ <item>وهک تهقینهوهی زۆر گهوره.</item>
+ <item>با دووباره چهمانهوهی کات بکهینهوه.</item>
+ <item>تهنیا بازبده بۆ بهجێهێشتن.</item>
+ <item>تۆ پالێتت ههیه بۆ خێرایی.</item>
+ <item>تهقاندنهوهی فۆتۆن.</item>
+ </string-array>
+ <string name="home_label">ماڵەوە</string>
+ <string name="cities_activity_title">شارهکان</string>
+ <string name="clock_style">ستایل</string>
+ <string-array name="clock_style_entries">
+ <item>پێوهری</item>
+ <item>ژمارهیی</item>
+ </string-array>
+ <string name="automatic_home_clock">کاتژمێری ماڵهوهی خۆکارانه</string>
+ <string name="automatic_home_clock_summary">کاتێک گهشت دهکهیت و شوێن دهگۆڕیت که کات جیاوازبێت،کاتژمێر زیاد بکه بۆ ماڵ</string>
+ <string name="home_time_zone">کاتی ماڵ</string>
+ <string name="home_time_zone_title">کاتی ماڵ</string>
+ <string-array name="timezone_labels" tools:ignore="Typos">
+ <item>"دوورگهکانی مارشاڵ"</item>
+ <item>"دورگهکانی میدوهی"</item>
+ <item>"هاوایی"</item>
+ <item>"ئالاسکا"</item>
+ <item>"کاتی زهریای هێمن"</item>
+ <item>"تیوانا"</item>
+ <item>"ئاریزۆنا"</item>
+ <item>"چیهوایا"</item>
+ <item>"کاتی شاخهکان"</item>
+ <item>"ناوهندی ئهمهریکا"</item>
+ <item>"کاتی ناوهندی"</item>
+ <item>"شاری مهکسیک"</item>
+ <item>"ساکاتخوان"</item>
+ <item>"باگۆتا"</item>
+ <item>"کاتی ڕۆژههڵاتی"</item>
+ <item>"ڤهنزوێلا"</item>
+ <item>"کاتی جهمسهری(باربادۆس)"</item>
+ <item>"کاتی جهمسهری(کهنهدا)"</item>
+ <item>"ماناوس"</item>
+ <item>"سانتیاگۆ"</item>
+ <item>"فاوندلاندی تازه"</item>
+ <item>"برازیل"</item>
+ <item>"بۆنس ئایرس"</item>
+ <item>"گرینلاند"</item>
+ <item>"مۆنتیڤیدیۆ"</item>
+ <item>"ناوهندهجهمسهر"</item>
+ <item>"ئازۆریس"</item>
+ <item>"دورگهکانی کاپی ڤێردی"</item>
+ <item>"کاسبلانکا"</item>
+ <item>"لهندهن، دوبلین"</item>
+ <item>"ئهمستهردام، بهرلین"</item>
+ <item>"بولگاریا"</item>
+ <item>"بروکسل"</item>
+ <item>"ساراجیڤۆ"</item>
+ <item>"ویندهۆک"</item>
+ <item>"کاتی ئهفریقا"</item>
+ <item>"عهمان و ئهردهن"</item>
+ <item>"ئهسینا و ئهستهنبوڵ"</item>
+ <item>"بهیروت و لوبنان"</item>
+ <item>"قاهیره"</item>
+ <item>"هێلسینکی"</item>
+ <item>"جێرالوس"</item>
+ <item>"مینسک"</item>
+ <item>"حهریری"</item>
+ <item>"بهغداد"</item>
+ <item>"مۆسکۆ"</item>
+ <item>"کوهیت"</item>
+ <item>"نایرۆبی"</item>
+ <item>"فشقشىتاران"</item>
+ <item>"باکو"</item>
+ <item>"تبلیس"</item>
+ <item>"یهریڤان"</item>
+ <item>"دوبهی"</item>
+ <item>"کابول"</item>
+ <item>"ئیسلام ئاباد"</item>
+ <item>"ئوراسک"</item>
+ <item>"یهکیتارینبوگ"</item>
+ <item>"کۆلکاتا"</item>
+ <item>"سریلانکا"</item>
+ <item>"کاتاماندوو"</item>
+ <item>"ئاستانا"</item>
+ <item>"یانگۆن"</item>
+ <item>"کراسنۆیارک"</item>
+ <item>"بانکۆک"</item>
+ <item>"بێژینگ"</item>
+ <item>"هۆنگ کۆنگ"</item>
+ <item>"ئیرکوتسک"</item>
+ <item>"کوالا لامپور"</item>
+ <item>"پێرس"</item>
+ <item>"تایپای"</item>
+ <item>"سێول"</item>
+ <item>"تۆکیۆ.ئۆساکا"</item>
+ <item>"یاکوتسک"</item>
+ <item>"ئهدێلایدی"</item>
+ <item>"داروین"</item>
+ <item>"بریسبان"</item>
+ <item>"هۆبارت"</item>
+ <item>"سیدنی ،جانبێرا"</item>
+ <item>"سیدنی ،جانبێرا"</item>
+ <item>"گوام"</item>
+ <item>"ماگادان"</item>
+ <item>"ماگادان"</item>
+ <item>"فیجی"</item>
+ <item>"تۆنگا"</item>
+ <item>"جاکارتا"</item>
+ </string-array>
+ <string name="shortcut_start_stopwatch_short">دەستپێکردن</string>
+ <string name="timers_in_use"><xliff:g id="number" example="7">%d</xliff:g> کاتپێو</string>
+ <string name="next_timer_notif">کاتپێوی دواتر: <xliff:g id="time_remaining" example="2 minutes remaining">%s</xliff:g></string>
+ <string name="night_mode_title">شێوازی شەو</string>
+ <string name="night_mode_summary">ڕوونمای زۆر تاریک (بۆ ژووری تاریک بهکاردێت)</string>
+ <string name="expand_alarm">بهربڵاوی ئاگادارکهرهوه</string>
+ <string name="collapse_alarm">لهناوچونی ئاگادارکهرهوه</string>
+ <string name="alarm_undo">گهڕانهوه</string>
+ <string name="world_day_of_week_label"> / <xliff:g id="label">%s</xliff:g></string>
+ <string name="next_alarm_description">ئاگادارکهرهوهی داهاتوو:<xliff:g id="alarm_time" example="Wed 8:00am">%s</xliff:g></string>
+ <string name="no_alarms">ئاگادارکردنهوه نییه</string>
+</resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index fa5f0b2..65f2944 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> мүн.</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Байкалбай калган таймер: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Тындыруу"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Бардык таймерлерди кайра коюу"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 0860a68..ea3ec5e 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -20,9 +20,6 @@
<resources>
<dimen name="time_margin_top">24dip</dimen>
- <dimen name="timer_setup_delete_margin">12sp</dimen>
- <dimen name="timer_setup_digit_font_size">26sp</dimen>
-
<!-- Size of margin for circles. -->
<dimen name="analog_clock_margin">70dp</dimen>
<dimen name="analog_clock_size">168dp</dimen>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
new file mode 100644
index 0000000..1e2f267
--- /dev/null
+++ b/res/values-lb/strings.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 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.
+ -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+ <string name="app_label">Auer</string>
+ <string name="label">Beschreiwung</string>
+ <string name="default_label">Wecker</string>
+ <string name="alarm_vibrate">Vibréieren</string>
+ <string name="alarm_repeat">Widderhuelen</string>
+ <string name="delete">Läschen</string>
+ <string name="alarm_tomorrow">Muer</string>
+ <string name="alarm_today">Haut</string>
+ <string name="alarm_alert_dismiss_text">Verwerfen</string>
+ <string name="alarm_missed_title">Verpasste Wecker</string>
+ <string name="alarm_alert_snoozed_text">Genäipt</string>
+ <plurals name="alarm_alert_snooze_duration">
+ <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">Wecker aus</string>
+ <string name="alarm_alert_snooze_text">Näipen</string>
+ <plurals name="alarm_alert_snooze_set">
+ <item quantity="one">Näipe fir 1 Minutt.</item>
+ <item quantity="other">Näipe fir <xliff:g id="minutes">%d</xliff:g> Minutten.</item>
+ </plurals>
+ <string name="alarm_alert_snooze_until">Näipe bis <xliff:g id="time">%s</xliff:g></string>
+ <string name="alarm_alert_predismiss_title">Nächste Wecker</string>
+ <string name="missed_alarm_has_been_deleted">Däi verpasste Wecker gouf geläscht</string>
+ <string name="timer_notifications_less_min">Manner wéi eng Minutt iwwreg</string>
+ <string-array name="alarm_set">
+ <item>Wecker gesat fir manner wéi 1 Minutt vun elo un.</item>
+ <item>Wecker gesat fir <xliff:g id="DAYS" example="2 days">%1$s</xliff:g> vun elo un.</item>
+ <item>Wecker gesat fir <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g> vun elo un.</item>
+ <item>Wecker gesat fir <xliff:g id="DAYS" example="2 days">%1$s</xliff:g> a(n) <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g> vun elo un.</item>
+ <item>Wecker gesat fir <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> vun elo un.</item>
+ <item>Wecker gesat fir <xliff:g id="DAYS" example="2 days">%1$s</xliff:g> a(n) <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> vun elo un.</item>
+ <item>Wecker gesat fir <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g> a(n) <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> vun elo un.</item>
+ <item>Wecker gesat fir <xliff:g id="DAYS" example="2 days">%1$s</xliff:g>, <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g> a(n) <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> vun elo un.</item>
+ </string-array>
+ <string name="every_day">All Dag</string>
+ <string name="day_concat">", "</string>
+ <string name="analog_gadget">Analogauer</string>
+ <string name="digital_gadget">Digitalauer</string>
+ <string name="settings">Astellungen</string>
+ <string name="snooze_duration_title">Näipdauer</string>
+ <string name="auto_silence_title">Roueg no</string>
+ <string name="auto_silence_never">Ni</string>
+ <string-array name="auto_silence_entries">
+ <item>1 Minutt</item>
+ <item>5 Minutten</item>
+ <item>10 Minutten</item>
+ <item>15 Minutten</item>
+ <item>20 Minutten</item>
+ <item>25 Minutten</item>
+ <item>Ni</item>
+ </string-array>
+ <string-array name="crescendo_entries">
+ <item>Aus</item>
+ <item>5 seconds</item>
+ <item>10 seconds</item>
+ <item>15 seconds</item>
+ <item>20 seconds</item>
+ <item>25 seconds</item>
+ <item>30 seconds</item>
+ <item>35 seconds</item>
+ <item>40 seconds</item>
+ <item>45 seconds</item>
+ <item>50 seconds</item>
+ <item>55 seconds</item>
+ <item>60 seconds</item>
+ </string-array>
+ <string-array name="snooze_duration_entries">
+ <item>1 Minutt</item>
+ <item>2 minutes</item>
+ <item>3 minutes</item>
+ <item>4 minutes</item>
+ <item>5 Minutten</item>
+ <item>6 minutes</item>
+ <item>7 minutes</item>
+ <item>8 minutes</item>
+ <item>9 minutes</item>
+ <item>10 Minutten</item>
+ <item>11 minutes</item>
+ <item>12 minutes</item>
+ <item>13 minutes</item>
+ <item>14 minutes</item>
+ <item>15 Minutten</item>
+ <item>16 minutes</item>
+ <item>17 minutes</item>
+ <item>18 minutes</item>
+ <item>19 minutes</item>
+ <item>20 Minutten</item>
+ <item>21 minutes</item>
+ <item>22 minutes</item>
+ <item>23 minutes</item>
+ <item>24 minutes</item>
+ <item>25 Minutten</item>
+ <item>26 minutes</item>
+ <item>27 minutes</item>
+ <item>28 minutes</item>
+ <item>29 minutes</item>
+ <item>30 minutes</item>
+ </string-array>
+ <string name="alarm_volume_title">Weckerlautstäerkt</string>
+ <string name="silent_ringtone_title">Roueg</string>
+ <string name="volume_button_setting_title">Lautstäerktknäppercher</string>
+ <string-array name="volume_button_setting_entries">
+ <item>Näipen</item>
+ <item>Verwerfen</item>
+ <item>Control volume</item>
+ </string-array>
+ <string name="label_description">Beschreiwung</string>
+ <string name="ringtone_description">Schelltoun</string>
+ <string name="menu_alarm">Wecker</string>
+ <string name="menu_timer">Sandauer</string>
+ <string name="menu_clock">Auer</string>
+ <string name="menu_stopwatch">Stoppauer</string>
+ <string name="button_alarms">Wecker dobäisetzen</string>
+ <string name="button_cities">Stied</string>
+ <string name="menu_item_settings">Astellungen</string>
+ <string name="menu_item_help">Hëllef</string>
+ <string name="menu_item_sort_by_gmt_offset">No Zäit zortéieren</string>
+ <string name="menu_item_sort_by_name">No Numm zortéieren</string>
+ <string name="selected_cities_label">Ausgewielt Stied</string>
+ <string name="sw_resume_button">Weider</string>
+ <string name="sw_reset_button">Zrécksetzen</string>
+ <string name="sw_start_button">Start</string>
+ <string name="sw_lap_button">Ronn</string>
+ <string name="sw_share_button">Deelen</string>
+ <string name="hours_label">St</string>
+ <string name="minutes_label">M</string>
+ <string name="seconds_label">S</string>
+ <string name="sw_share_main">Meng Zäit ass <xliff:g id="time">%s</xliff:g></string>
+ <string name="sw_share_laps">Ronnenzäiten:</string>
+ <string name="sw_notification_lap_number"><xliff:g id="number">%d</xliff:g>. Ronn</string>
+ <string name="timer_add_timer">Sandauer dobäisetzen</string>
+ <string name="timer_start">Start</string>
+ <string name="timer_delete">Läschen</string>
+ <string name="timer_plus_one">Eng Minutt méi</string>
+ <string name="timer_plus_1_min">Eng Min. méi</string>
+ <string name="timer_stop">Stopp</string>
+ <string name="timer_reset">Zrécksetzen</string>
+ <string name="timer_cancel">Ofbriechen</string>
+ <string name="timer_times_up">D\'Zäit ass eriwwer</string>
+ <string name="timer_notification_label">Sandauer</string>
+ <string-array name="sw_share_strings" translatable="true">
+ <item>Du bass verdäiwelt séier.</item>
+ <item>Genéiss d\'Friichte vun denger Aarbecht.</item>
+ <item>Androide si bekannt fir séier ze sinn, awer net sou séier wéi s du!</item>
+ <item>Puh!</item>
+ <item>L33t-Zäiten.</item>
+ <item>Wahnsinnsgeschwindegkeet.</item>
+ <item>Let\'s do the time warp again.</item>
+ <item>Just a jump to the left.</item>
+ <item>Dir schéngt den Hënner ze brennen.</item>
+ <item>Photonevitess.</item>
+ </string-array>
+ <string name="home_label">Doheem</string>
+ <string name="cities_activity_title">Stied</string>
+ <string name="clock_settings">Auer</string>
+ <string name="clock_style">Stil</string>
+ <string-array name="clock_style_entries">
+ <item>Analog</item>
+ <item>Digital</item>
+ </string-array>
+ <string name="automatic_home_clock">Automatesch Heemechtsauer</string>
+ <string name="automatic_home_clock_summary">Beim Reesen an engem Gebitt wou d\'Zäit anescht ass, eng Auer fir d\'Zäit doheem dobäisetzen</string>
+ <string name="home_time_zone">Heemechtszäitzon</string>
+ <string name="home_time_zone_title">Heemechtszäitzon</string>
+ <string-array name="timezone_labels" tools:ignore="Typos">
+ <item>"Marshallinselen"</item>
+ <item>"Midwayinselen"</item>
+ <item>"Hawaii"</item>
+ <item>"Alaska"</item>
+ <item>"Pacific Standard Time (PST)"</item>
+ <item>"Tijuana"</item>
+ <item>"Arizona"</item>
+ <item>"Chihuahua"</item>
+ <item>"Mountain Standard Time (MST)"</item>
+ <item>"Zentralamerika"</item>
+ <item>"Central Standard Time (CST)"</item>
+ <item>"Mexiko-Stad"</item>
+ <item>"Saskatchewan"</item>
+ <item>"Bogotá"</item>
+ <item>"Eastern Standard Time (EST)"</item>
+ <item>"Venezuela"</item>
+ <item>"Atlantic Standard Time (EST, Barbados)"</item>
+ <item>"Atlantic Standard Time (EST, Kanada)"</item>
+ <item>"Manaus"</item>
+ <item>"Santiago de Chile"</item>
+ <item>"Neifundland"</item>
+ <item>"Brasília"</item>
+ <item>"Buenos Aires"</item>
+ <item>"Grönland"</item>
+ <item>"Montevideo"</item>
+ <item>"Mëttelatlantik"</item>
+ <item>"Azoren"</item>
+ <item>"Kap Verde"</item>
+ <item>"Casablanca"</item>
+ <item>"London, Dublin"</item>
+ <item>"Amsterdam, Berlin"</item>
+ <item>"Belgrad"</item>
+ <item>"Bréissel"</item>
+ <item>"Sarajevo"</item>
+ <item>"Windhoek"</item>
+ <item>"Westafrikanesch Zäit"</item>
+ <item>"Amman, Jordanien"</item>
+ <item>"Athen, Istanbul"</item>
+ <item>"Beirut, Libanon"</item>
+ <item>"Kairo"</item>
+ <item>"Helsinki"</item>
+ <item>"Jerusalem"</item>
+ <item>"Minsk"</item>
+ <item>"Harare"</item>
+ <item>"Bagdad"</item>
+ <item>"Moskau"</item>
+ <item>"Kuwait"</item>
+ <item>"Nairobi"</item>
+ <item>"Teheran"</item>
+ <item>"Baku"</item>
+ <item>"Tiflis"</item>
+ <item>"Eriwan"</item>
+ <item>"Dubai"</item>
+ <item>"Kabul"</item>
+ <item>"Islamabad, Karachi"</item>
+ <item>"Ural'sk"</item>
+ <item>"Jekaterinbuerg"</item>
+ <item>"Kolkata"</item>
+ <item>"Sri Lanka"</item>
+ <item>"Kathmandu"</item>
+ <item>"Astana"</item>
+ <item>"Rangun"</item>
+ <item>"Krasnojarsk"</item>
+ <item>"Bangkok"</item>
+ <item>"Beijing"</item>
+ <item>"Hong Kong"</item>
+ <item>"Irkutsk"</item>
+ <item>"Kuala Lumpur"</item>
+ <item>"Perth"</item>
+ <item>"Taipeh"</item>
+ <item>"Seoul"</item>
+ <item>"Tokio, Osaka"</item>
+ <item>"Jakutsk"</item>
+ <item>"Adelaide"</item>
+ <item>"Darwin"</item>
+ <item>"Brisbane"</item>
+ <item>"Hobart"</item>
+ <item>"Sidney, Canberra"</item>
+ <item>"Wladiwostok"</item>
+ <item>"Guam"</item>
+ <item>"Magadan"</item>
+ <item>"Auckland"</item>
+ <item>"Fidschi"</item>
+ <item>"Tonga"</item>
+ <item>"Jakarta"</item>
+ </string-array>
+ <string name="shortcut_start_stopwatch_short">Start</string>
+ <string name="alarm_settings">Weckeren</string>
+ <string name="description_direction_right">No riets wësche fir ze verwerfen</string>
+ <string name="description_direction_left">No lénks wësche fir ze näipen</string>
+ <string name="timers_in_use"><xliff:g id="number" example="7">%d</xliff:g> Sandaueren</string>
+ <string name="next_timer_notif">Nächst Sandauer: <xliff:g id="time_remaining" example="2 minutes remaining">%s</xliff:g></string>
+ <string name="night_mode_title">Nuetsmodus</string>
+ <string name="night_mode_summary">Ganz ofgedonkelte Schierm (fir däischter Raim)</string>
+ <string name="expand_alarm">Wecker opklappen</string>
+ <string name="collapse_alarm">Wecker zesummeklappen</string>
+ <string name="alarm_undo">réckgängeg maachen</string>
+ <string name="world_day_of_week_label"> / <xliff:g id="label">%s</xliff:g></string>
+ <string name="world_tomorrow">Muer</string>
+ <string name="next_alarm_description">Nächste Wecker: <xliff:g id="alarm_time" example="Wed 8:00am">%s</xliff:g></string>
+ <string name="no_alarms">Keng Weckeren</string>
+</resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 60e5082..7b3b706 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ນທ</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ການຕັ້ງເວລາທີ່ພາດໄປ: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"ຢຸດຊົ່ວຄາວ"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"ຣີເຊັດໂມງນັບຖອຍຫຼັງ"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 1c7d3af..f7387be 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Šiandien"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Atsisakyti"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Praleistas signalas"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Snausti"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min.</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Praleistas laikmatis: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pristabdyti"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Iš n. nust. vis. laikm."</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index f246267..4abb409 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Šodien"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Noraidīt"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Signāls tika nokavēts."</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> — <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Atlikts"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="zero"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -248,8 +248,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Nokavēts taimeris: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Apturēt"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Atiest. taimerus"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 8a86111..af710d8 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> мин.</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Пропуштен тајмер: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Паузирај"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Ресетирај ги сите тајмери"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index d22bfc6..ad3624d 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> മി.</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"വിട്ടുപോയ ടൈമർ: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"തൽക്കാലം നിർത്തൂ"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"എല്ലാ ടൈമറുകളും പുനഃസജ്ജമാക്കുക"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 6874400..807f8b3 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> минут</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Цаг хэмжигчийг алгассан: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Түр зогсоох"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Бүх цаг хэмжигчийг шинэчлэх"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 0ad2597..9245b64 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> मिनिटे</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"चुकविलेला टायमर: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"विराम"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"सर्व टायमर रीसेट करा"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 9aa2462..9359e5b 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Hari ini"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Tutup"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Penggera terlepas"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Ditunda"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Pemasa terlepas: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Jeda"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Ttpkn sml pmasa"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 6ecb8d7..54c1136 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> မိနစ်</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"လွတ်သွားသည့် သတိပေးချက်− <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"ရပ်တန့်ရန်"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"တိုင်မာ အားလုံး ပြင်ဆင်သတ်မှတ်ရန်"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-sw360dp-land/dimens.xml b/res/values-nb/cm_strings.xml
similarity index 65%
copy from res/values-sw360dp-land/dimens.xml
copy to res/values-nb/cm_strings.xml
index 33bf986..0e11910 100644
--- a/res/values-sw360dp-land/dimens.xml
+++ b/res/values-nb/cm_strings.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,7 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources>
- <dimen name="timer_setup_digit_font_size">40sp</dimen>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string-array name="action_setting_entries">
+ <item>Utsett</item>
+ <item>Avvis</item>
+ <item>Ingenting</item>
+ </string-array>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a8df7a8..30aa4a6 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"I dag"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Slå av"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Tapt alarm"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Utsatt"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Oversett tidtaker: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Sett på pause"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Tilbakestill alle tidtakere"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 044901b..c79d9db 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> मिनेट</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"छुटेको टाइमर: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"रोक्नुहोस्"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"सबै टाइमरहरू रिसेट गर्नुहोस्"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
new file mode 100644
index 0000000..be56423
--- /dev/null
+++ b/res/values-night/colors.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 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.
+ -->
+
+<resources>
+ <color name="default_background">#121212</color>
+ <color name="accent_color">#FEF177</color>
+ <color name="secondary_color">#212121</color>
+</resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
new file mode 100644
index 0000000..0504a85
--- /dev/null
+++ b/res/values-nl/cm_strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Actie bij toestel omdraaien</string>
+ <string name="shake_action_title">Actie bij toestel schudden</string>
+ <string-array name="action_setting_entries">
+ <item>Snoozen</item>
+ <item>Uitschakelen</item>
+ <item>Geen</item>
+ </string-array>
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index a9e0b0e..839dc71 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Vandaag"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Uitzetten"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Wekker gemist"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Gemiste timer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pauzeren"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Alle timers resetten"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index a669405..70c3a1b 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ମିନିଟ୍</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ଛାଡ଼ିଯାଇଥିବା ଟାଇମର୍: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"ପଜ୍ କରନ୍ତୁ"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"ସବୁ ଟାଇମର୍କୁ ରିସେଟ୍ କରନ୍ତୁ"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index c0efbe7..6e40a6b 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ਮਿੰਟ</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ਖੁੰਝਿਆ ਟਾਈਮਰ: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"ਰੋਕੋ"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"ਸਾਰੇ ਟਾਈਮਰ ਰੀਸੈੱਟ ਕਰੋ"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
new file mode 100644
index 0000000..db79c3d
--- /dev/null
+++ b/res/values-pl/cm_strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Reakcja na odwrócenie urządzenia</string>
+ <string name="shake_action_title">Reakcja na potrząśnięcie urządzenia</string>
+ <string-array name="action_setting_entries">
+ <item>Drzemka</item>
+ <item>Odrzuć</item>
+ <item>Nic nie rób</item>
+ </string-array>
+</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 45d4b34..37ca95e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Dzisiaj"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Wyłącz"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Przegapiony alarm"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Uśpiony"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Pominięty minutnik: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Wstrzymaj"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Resetuj wszystko"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
new file mode 100644
index 0000000..676f3db
--- /dev/null
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Ação ao virar o dispositivo</string>
+ <string name="shake_action_title">Ação ao agitar o dispositivo</string>
+ <string-array name="action_setting_entries">
+ <item>Soneca</item>
+ <item>Ignorar</item>
+ <item>Não fazer nada</item>
+ </string-array>
+ <string name="alarm_missed_channel">Alarmes perdidos</string>
+ <string name="alarm_snooze_channel">Alarmes silenciados</string>
+ <string name="alarm_upcoming_channel">Próximos alarmes</string>
+ <string name="stopwatch_channel">Cronômetro</string>
+ <string name="timer_channel">Temporizador</string>
+</resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
new file mode 100644
index 0000000..2fc9c1c
--- /dev/null
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Ação ao virar o dispositivo</string>
+ <string name="shake_action_title">Ação ao agitar o dispositivo</string>
+ <string-array name="action_setting_entries">
+ <item>Suspender</item>
+ <item>Ignorar</item>
+ <item>Não fazer nada</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Disparo de alarmes e temporizadores</string>
+ <string name="alarm_missed_channel">Alarmes perdidos</string>
+ <string name="alarm_snooze_channel">Alarmes adiados</string>
+ <string name="alarm_upcoming_channel">Próximos alarmes</string>
+ <string name="stopwatch_channel">Cronómetro</string>
+ <string name="timer_channel">Temporizador</string>
+</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index cf631b8..d20bd35 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Hoje"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Ignorar"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarme perdido"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Suspenso"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Temporizador perdido: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Interromper"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Repor tds temp."</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9b355aa..054a274 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Hoje"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Encerrar"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarme perdido"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Adiado"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Timer perdido: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pausar"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Red. timers"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
new file mode 100644
index 0000000..6ee47dd
--- /dev/null
+++ b/res/values-ro/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Acțiune la rotirea dispozitivului</string>
+ <string name="shake_action_title">Acțiune la agitarea dispozitivului</string>
+ <string-array name="action_setting_entries">
+ <item>Amânați</item>
+ <item>Renunţaţi</item>
+ <item>Nimic</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Expirare alarme & numărători inverse</string>
+ <string name="alarm_missed_channel">Alarme ratate</string>
+ <string name="alarm_snooze_channel">Alarme amânate</string>
+ <string name="alarm_upcoming_channel">Alarme viitoare</string>
+ <string name="stopwatch_channel">Cronometru</string>
+ <string name="timer_channel">Numărătoare inversă</string>
+</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a2ce6c1..57e7a08 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Astăzi"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Închideți"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarmă ratată"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Amânată"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> minute</item>
@@ -248,8 +248,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Temporizator ratat: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Întrerupeți"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Resetați-le pe toate"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
new file mode 100644
index 0000000..962ed72
--- /dev/null
+++ b/res/values-ru/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Действие при повороте устройства</string>
+ <string name="shake_action_title">Действие при встряхивании устройства</string>
+ <string-array name="action_setting_entries">
+ <item>Отложить</item>
+ <item>Выключить</item>
+ <item>Ничего</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Важные сигналы и таймеры</string>
+ <string name="alarm_missed_channel">Пропущенные будильники</string>
+ <string name="alarm_snooze_channel">Отложенные будильники</string>
+ <string name="alarm_upcoming_channel">Следующие будильники</string>
+ <string name="stopwatch_channel">Секундомер</string>
+ <string name="timer_channel">Таймер</string>
+</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f4c2cb3..485da46 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one">на <xliff:g id="NUMBER">%d</xliff:g> минуту</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Пропущенный таймер: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Приостановить"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Сбросить все"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index e16e592..ce71b17 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one">මිනි <xliff:g id="NUMBER">%d</xliff:g></item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"මග හැරුණු කාල ගණකය: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"විරාමය"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"සියලු කාල ගණක යළි සකසන්න"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
new file mode 100644
index 0000000..981fb86
--- /dev/null
+++ b/res/values-sk/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Akcia pri otočení telefónu</string>
+ <string name="shake_action_title">Akcie pri zatrasení telefónom</string>
+ <string-array name="action_setting_entries">
+ <item>Odložiť</item>
+ <item>Zrušiť</item>
+ <item>Nič</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Výstražné poplachy & časovače</string>
+ <string name="alarm_missed_channel">Zmeškané budíky</string>
+ <string name="alarm_snooze_channel">Odložené budíky</string>
+ <string name="alarm_upcoming_channel">Nadchádzajúce budíky</string>
+ <string name="stopwatch_channel">Stopky</string>
+ <string name="timer_channel">Časovač</string>
+</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index c1bf4d3..8eca944 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"dnes"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Zavrieť"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Zmeškaný budík"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Odložené"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Zmeškaný časovač: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pozastaviť"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Reset. časovače"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
new file mode 100644
index 0000000..f9c4f2d
--- /dev/null
+++ b/res/values-sl/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Dejanje obračanja naprave</string>
+ <string name="shake_action_title">Dejanje tresenja naprave</string>
+ <string-array name="action_setting_entries">
+ <item>Dremež</item>
+ <item>Opusti</item>
+ <item>Brez</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Opuščanje budilk in odštevalnikov</string>
+ <string name="alarm_missed_channel">Zamujene budilke</string>
+ <string name="alarm_snooze_channel">Budilke v dremežu</string>
+ <string name="alarm_upcoming_channel">Prihajajoče budilke</string>
+ <string name="stopwatch_channel">Štoparica</string>
+ <string name="timer_channel">Odštevalnik</string>
+</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 75fbcc2..33de705 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Danes"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Opusti"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Zamujen alarm"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Preloženo"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Zamujen časovnik: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Zaustavitev"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Ponastavi vse časovnike"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-sq/cm_strings.xml b/res/values-sq/cm_strings.xml
new file mode 100644
index 0000000..7aa61a2
--- /dev/null
+++ b/res/values-sq/cm_strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Veprimi i kthimit së paisjes</string>
+ <string name="shake_action_title">Veprimi i tundjes së paisjes</string>
+ <string-array name="action_setting_entries">
+ <item>Shty</item>
+ <item>Injoro</item>
+ <item>Mos bë gjë</item>
+ </string-array>
+ <string name="stopwatch_channel">Kronometri</string>
+ <string name="timer_channel">Kohëmatës</string>
+</resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 1c62304..87f215d 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Sot"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Injoro"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarm i humbur"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Dremitur"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minuta</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Kohëmatës i humbur: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pauzë"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Rivendos të gjithë kohëmatësit"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
new file mode 100644
index 0000000..7d18e2a
--- /dev/null
+++ b/res/values-sr/cm_strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Акција обртања уређаја</string>
+ <string name="shake_action_title">Акција кад се уређај протресе</string>
+ <string-array name="action_setting_entries">
+ <item>Одложи</item>
+ <item>Одбаци</item>
+ <item>Ништа</item>
+ </string-array>
+</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index b1523d9..9cd453a 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> мин</item>
@@ -248,8 +248,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Пропуштени тајмер: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Паузирај"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Рес. све тајм."</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-sw360dp-land/dimens.xml b/res/values-sv/cm_strings.xml
similarity index 65%
copy from res/values-sw360dp-land/dimens.xml
copy to res/values-sv/cm_strings.xml
index 33bf986..e2ad36d 100644
--- a/res/values-sw360dp-land/dimens.xml
+++ b/res/values-sv/cm_strings.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,7 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources>
- <dimen name="timer_setup_digit_font_size">40sp</dimen>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string-array name="action_setting_entries">
+ <item>Pausa</item>
+ <item>Avvisa</item>
+ <item>Ingenting</item>
+ </string-array>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a30cc3b..1b61c79 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"I dag"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Stäng av"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarmet lämnades utan åtgärd"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Snoozar"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minuter</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Missad timer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pausa"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Återställ alla"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 2c27f02..4e045f7 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Leo"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Ondoa"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Kengele ambayo haikushughulikiwa"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Imeahirishwa"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other">Dak <xliff:g id="NUMBER">%d</xliff:g> </item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Kipima muda ambacho hukusikia: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Sitisha"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Anzisha vipima wakati vyote upya"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-sw320dp-port/dimens.xml b/res/values-sw320dp-port/dimens.xml
index b3b3702..6a3e8ed 100644
--- a/res/values-sw320dp-port/dimens.xml
+++ b/res/values-sw320dp-port/dimens.xml
@@ -16,5 +16,4 @@
<resources>
<dimen name="no_alarms_size">120dp</dimen>
- <dimen name="timer_setup_digit_font_size">40sp</dimen>
</resources>
diff --git a/res/values-sw320dp/dimens.xml b/res/values-sw320dp/dimens.xml
index cb60168..d64c205 100644
--- a/res/values-sw320dp/dimens.xml
+++ b/res/values-sw320dp/dimens.xml
@@ -16,5 +16,4 @@
<resources>
<dimen name="big_font_size">60sp</dimen>
- <dimen name="timer_setup_digit_font_size">32sp</dimen>
</resources>
\ No newline at end of file
diff --git a/res/values-sw360dp/dimens.xml b/res/values-sw360dp/dimens.xml
index 683eda9..d80b3bb 100644
--- a/res/values-sw360dp/dimens.xml
+++ b/res/values-sw360dp/dimens.xml
@@ -18,5 +18,4 @@
<dimen name="big_font_size">70sp</dimen>
<dimen name="main_clock_font_size">80sp</dimen>
<dimen name="no_alarms_size">120dp</dimen>
- <dimen name="timer_setup_digit_font_size">56sp</dimen>
</resources>
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index 1793832..157e8b4 100644
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -19,9 +19,6 @@
<resources>
<dimen name="time_margin_top">32dip</dimen>
- <dimen name="timer_setup_delete_margin">19sp</dimen>
- <dimen name="timer_setup_digit_font_size">46sp</dimen>
-
<!-- Size of margin for circles. -->
<dimen name="circle_margin_top">0dp</dimen>
<dimen name="analog_clock_margin">48dp</dimen>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index b912546..2c3a50d 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -44,11 +44,6 @@
<dimen name="label_margin_big">8dp</dimen>
- <!-- Specified in sp to match the top margin of the time on the adjacent world clock tab. -->
- <dimen name="timer_setup_top_margin">24sp</dimen>
- <dimen name="timer_setup_delete_margin">21sp</dimen>
- <dimen name="timer_setup_digit_font_size">86sp</dimen>
-
<!-- Size of margin for circles. -->
<dimen name="circle_margin_top">48dp</dimen>
<dimen name="analog_clock_margin">96dp</dimen>
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
deleted file mode 100644
index c6665b6..0000000
--- a/res/values-sw720dp-land/dimens.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
- <dimen name="timer_setup_delete_margin">19sp</dimen>
- <dimen name="timer_setup_digit_font_size">76sp</dimen>
-</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 20bab18..c096a09 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> நிமிடங்கள்</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"தவறிய டைமர்: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"இடைநிறுத்து"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"எல்லா டைமர்களையும் மீட்டமை"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 88041bd..9a73387 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> నిమి</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ఈ టైమర్ చూసుకోలేదు: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"పాజ్ చేయి"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"టైమర్లన్నీ రీసెట్ చేయి"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
new file mode 100644
index 0000000..005aa3b
--- /dev/null
+++ b/res/values-th/cm_strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">การพลิกอุปกรณ์</string>
+ <string name="shake_action_title">การเขย่าอุปกรณ์</string>
+ <string-array name="action_setting_entries">
+ <item>งีบหลับ</item>
+ <item>ยกเลิก</item>
+ <item>ไม่ทำอะไร</item>
+ </string-array>
+ <string name="stopwatch_channel">จับเวลา</string>
+ <string name="timer_channel">จับเวลา</string>
+</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ac351f0..3ff2c1a 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> นาที</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ตัวตั้งเวลาที่พลาดไป: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"หยุดชั่วคราว"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"รีเซ็ตตัวจับเวลาทั้งหมด"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 5132eef..0e4dd59 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Ngayon"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"I-dismiss"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Napalampas ang alarma"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Naka-snooze"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Napalampas na timer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"I-pause"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"I-reset lahat ng timer"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
new file mode 100644
index 0000000..55d1bbd
--- /dev/null
+++ b/res/values-tr/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Cihazı çevirme eylemi</string>
+ <string name="shake_action_title">Cihazı sallama eylemi</string>
+ <string-array name="action_setting_entries">
+ <item>Ertele</item>
+ <item>Reddet</item>
+ <item>Hiçbiri</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">Alarmı ve zamanlayıcıları tetikler</string>
+ <string name="alarm_missed_channel">Alarmlar kaçırıldı</string>
+ <string name="alarm_snooze_channel">Alarmları ertele</string>
+ <string name="alarm_upcoming_channel">Yaklaşan alarmlar</string>
+ <string name="stopwatch_channel">Kronometre</string>
+ <string name="timer_channel">Zamanlayıcı</string>
+</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 66a5489..66c1cfe 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Bugün"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Kapat"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarm kaçırıldı"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Ertelendi"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> dk.</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Kaçırılan zamanlayıcı: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Duraklat"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Tüm zamanlayıcıları sıfırla"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
new file mode 100644
index 0000000..1606c08
--- /dev/null
+++ b/res/values-ug/strings.xml
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 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.
+ -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+ <string name="app_label">سائەت</string>
+ <string name="label">بەلگە</string>
+ <string name="default_label">قوڭغۇراق</string>
+ <string name="alarm_vibrate">تىترەت</string>
+ <string name="alarm_repeat">قايتىلا</string>
+ <string name="delete">ئۆچۈر</string>
+ <string name="alarm_alert_dismiss_text">تاقا</string>
+ <string name="alarm_missed_title">ئۆتكۈزۈۋەتكەن قوڭغۇراق</string>
+ <string name="alarm_alert_snooze_text">قايتا جىرىڭلاتما</string>
+ <string name="alarm_alert_snooze_until"><xliff:g id="TIME">%s</xliff:g> غىچە كېچىكتۈر</string>
+ <string name="alarm_alert_predismiss_title">ئالدىن بېكىتىلگەن قوڭغۇراق</string>
+ <string name="missed_alarm_has_been_deleted">ئۆتكۈزۈۋەتكەن قوڭغۇراق ئۆچۈرۈلدى</string>
+ <string name="timer_notifications_less_min">بىر مىنۇتمۇ قالمىدى</string>
+ <string-array name="alarm_set">
+ <item>قوڭغۇراق ھازىردىن باشلاپ 1 مىنۇتقا يەتمىگەن ۋاقىتتا ئەسكەرتىشكە تەڭشەلدى.</item>
+ <item>قوڭغۇراق ھازىردىن باشلاپ <xliff:g id="DAYS">%1$s</xliff:g> دىن كېيىن ئەسكەرتىشكە تەڭشەلدى.</item>
+ <item>قوڭغۇراق ھازىردىن باشلاپ <xliff:g id="HOURS">%2$s</xliff:g> دىن كېيىن ئەسكەرتىشكە تەڭشەلدى.</item>
+ <item>قوڭغۇراق ھازىردىن باشلاپ <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g> دىن كېيىن ئەسكەرتىشكە تەڭشەلدى.</item>
+ <item>قوڭغۇراق ھازىردىن باشلاپ <xliff:g id="MINUTES">%3$s</xliff:g> دىن كېيىن ئەسكەرتىشكە تەڭشەلدى.</item>
+ <item>قوڭغۇراق ھازىردىن باشلاپ<xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g> دىن كېيىن ئەسكەرتىشكە تەڭشەلدى.</item>
+ <item>قوڭغۇراق ھازىردىن باشلاپ <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g> دىن كېيىن ئەسكەرتىشكە تەڭشەلدى.</item>
+ <item>قوڭغۇراق ھازىردىن باشلاپ <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g> دىن كېيىن ئەسكەرتىشكە تەڭشەلدى.</item>
+ </string-array>
+ <string name="every_day">ھەر كۈنى</string>
+ <string name="day_concat">"« ،»"</string>
+ <string name="analog_gadget">تەقلىد سائەت</string>
+ <string name="digital_gadget">رەقەملىك سائەت</string>
+ <string name="settings">تەڭشەكلەر</string>
+ <string name="snooze_duration_title">مۈگدەش ئۇزۇنلۇقى</string>
+ <string name="auto_silence_title">قوڭغۇراق ۋاقتى</string>
+ <string name="auto_silence_never">ھەرگىز</string>
+ <string-array name="auto_silence_entries">
+ <item>1 minute</item>
+ <item>5 minutes</item>
+ <item>10 minutes</item>
+ <item>15 minutes</item>
+ <item>20 minutes</item>
+ <item>25 minutes</item>
+ <item>ھەرگىز</item>
+ </string-array>
+ <string-array name="snooze_duration_entries">
+ <item>1 minute</item>
+ <item>2 minutes</item>
+ <item>3 minutes</item>
+ <item>4 minutes</item>
+ <item>5 minutes</item>
+ <item>6 minutes</item>
+ <item>7 minutes</item>
+ <item>8 minutes</item>
+ <item>9 minutes</item>
+ <item>10 minutes</item>
+ <item>11 minutes</item>
+ <item>12 minutes</item>
+ <item>13 minutes</item>
+ <item>14 minutes</item>
+ <item>15 minutes</item>
+ <item>16 minutes</item>
+ <item>17 minutes</item>
+ <item>18 minutes</item>
+ <item>19 minutes</item>
+ <item>20 minutes</item>
+ <item>21 minutes</item>
+ <item>22 minutes</item>
+ <item>23 minutes</item>
+ <item>24 minutes</item>
+ <item>25 minutes</item>
+ <item>26 minutes</item>
+ <item>27 minutes</item>
+ <item>28 minutes</item>
+ <item>29 minutes</item>
+ <item>30 minutes</item>
+ </string-array>
+ <string name="alarm_volume_title">قوڭغۇراق ئاۋازى</string>
+ <string name="silent_ringtone_title">ئۈنسىز</string>
+ <string name="volume_button_setting_title">ئاۋاز توپچىسى</string>
+ <string-array name="volume_button_setting_entries">
+ <item>قايتا جىرىڭلاتما</item>
+ <item>تاقا</item>
+ <item>Control volume</item>
+ </string-array>
+ <string name="label_description">بەلگە</string>
+ <string name="ringtone_description">زىل ئاۋازى</string>
+ <string name="menu_alarm">قوڭغۇراق</string>
+ <string name="menu_timer">ۋاقىت خاتىرىلىگۈچ</string>
+ <string name="menu_clock">سائەت</string>
+ <string name="menu_stopwatch">دەقىقە سائەت</string>
+ <string name="button_cities">شەھەرلەر</string>
+ <string name="menu_item_settings">تەڭشەكلەر</string>
+ <string name="menu_item_help">ياردەم</string>
+ <string name="menu_item_sort_by_gmt_offset">ۋاقىت بويىچە تەرتىپلە</string>
+ <string name="menu_item_sort_by_name">ئات بويىچە تەرتىپلە</string>
+ <string name="selected_cities_label">تاللانغان شەھەرلەر</string>
+ <string name="sw_resume_button">داۋاملاشتۇر</string>
+ <string name="sw_reset_button">ئەسلىگە قايتۇر</string>
+ <string name="sw_start_button">باشلا</string>
+ <string name="sw_lap_button">ئايلانما</string>
+ <string name="sw_share_button">ھەمبەھىر</string>
+ <string name="hours_label">h</string>
+ <string name="minutes_label">m</string>
+ <string name="seconds_label">s</string>
+ <string name="sw_share_main">ۋاقتىم <xliff:g id="TIME">%s</xliff:g></string>
+ <string name="sw_share_laps">ئايلانما ۋاقتى:</string>
+ <string name="sw_notification_lap_number"><xliff:g id="NUMBER">%d</xliff:g> ئايلانما</string>
+ <string name="timer_add_timer">ۋاقىت خاتىرىلىگۈچنى قوش</string>
+ <string name="timer_start">باشلا</string>
+ <string name="timer_delete">ئۆچۈر</string>
+ <string name="timer_plus_one">1 مىنۇت قوش</string>
+ <string name="timer_plus_1_min">1 مىنۇت قوش</string>
+ <string name="timer_stop">توختا</string>
+ <string name="timer_reset">ئەسلىگە قايتۇر</string>
+ <string name="timer_cancel">ۋاز كەچ</string>
+ <string name="timer_times_up">ۋاقىت توشتى</string>
+ <string name="timer_notification_label">ۋاقىت خاتىرىلىگۈچ</string>
+ <string-array name="sw_share_strings" translatable="true">
+ <item>چاقماق پەلۋاندەك تېزكەنسىز.</item>
+ <item>ئەمگەك مىۋىڭىزدىن ھوزۇرلىنىڭ.</item>
+ <item>Android سۈرئىتى تېزلىكى بىلەن داڭلىق، ئەمما سىزگە يەتمەيدۇ!</item>
+ <item>پاھ.</item>
+ <item>ھەقىقەتەن قالتىس.</item>
+ <item>ھەيران قالارلىق سۈرئەت.</item>
+ <item>يەنە بىر كېلىڭ.</item>
+ <item>ئاسانلا ئىش بۇ.</item>
+ <item>يەلتاپاندەكلا تېزكەنسىز.</item>
+ <item>نۇر تېزلىكى.</item>
+ </string-array>
+ <string name="home_label">باش بەت</string>
+ <string name="cities_activity_title">شەھەرلەر</string>
+ <string name="clock_style">ئۇسلۇب</string>
+ <string-array name="clock_style_entries">
+ <item>تەقلىد</item>
+ <item>رەقەملىك</item>
+ </string-array>
+ <string name="automatic_home_clock">ئۆيدىكى ۋاقىتنى ئاپتوماتىك كۆرسىتىدۇ</string>
+ <string name="automatic_home_clock_summary">باشقا ۋاقىت رايونىدا ساياھەت قىلغاندا ئۆيدىكى ۋاقىتنى كۆرسىتىدۇ</string>
+ <string name="home_time_zone">يەرلىك ۋاقىت رايونى</string>
+ <string name="home_time_zone_title">يەرلىك ۋاقىت رايونى</string>
+ <string-array name="timezone_labels" tools:ignore="Typos">
+ <item>"مارشال ئاراللىرى"</item>
+ <item>"مىدۋېي ئارىلى"</item>
+ <item>"ھاۋاي"</item>
+ <item>"ئالياسكا"</item>
+ <item>"تىنچ ئوكيان ۋاقتى"</item>
+ <item>"تىۋانا"</item>
+ <item>"ئارىزونا"</item>
+ <item>"چىۋاۋا"</item>
+ <item>"تاغ ۋاقتى"</item>
+ <item>"ئوتتۇرا ئامېرىكا"</item>
+ <item>"ئوتتۇرا رايون ۋاقتى"</item>
+ <item>"مېكسىكا شەھىرى"</item>
+ <item>"ساسكاچېۋان"</item>
+ <item>"بوگۇتا"</item>
+ <item>"شەرقىي رايون ۋاقتى"</item>
+ <item>"ۋېنېزۇئېلا"</item>
+ <item>"ئاتلانتىك ئوكيان ۋاقتى (باربادوس)"</item>
+ <item>"ئاتلانتىك ئوكيان ۋاقتى (كانادا)"</item>
+ <item>"مانائۇس"</item>
+ <item>"سانتىياگو"</item>
+ <item>"نېۋفۇندلاند"</item>
+ <item>"بىرازىلىيە"</item>
+ <item>"بۇئېنۇس-ئايرېس"</item>
+ <item>"گىرېنلاند"</item>
+ <item>"مونتېۋىدېئو"</item>
+ <item>"ئوتتۇرا ئاتلانتىك ئوكيان"</item>
+ <item>"ئازور"</item>
+ <item>"يېشىل تۇمشۇق ئاراللىرى"</item>
+ <item>"كازابلانكا"</item>
+ <item>"لوندون، دۇبلىن"</item>
+ <item>"ئامىستېردام، بېرلىن"</item>
+ <item>"بېلگراد"</item>
+ <item>"بىريۇسسېل"</item>
+ <item>"سارايېۋو"</item>
+ <item>"ۋىندخوك"</item>
+ <item>"غەربىي ئافرىقا ۋاقتى"</item>
+ <item>"ئاممان، ئىيوردانىيە"</item>
+ <item>"ئافېنا، ئىستانبۇل"</item>
+ <item>"بېيرۇت، لىۋان"</item>
+ <item>"قاھىرە"</item>
+ <item>"خېلسىنكى"</item>
+ <item>"قۇددۇس"</item>
+ <item>"مىنسك"</item>
+ <item>"خارارې"</item>
+ <item>"باغداد"</item>
+ <item>"موسكۋا"</item>
+ <item>"كۈۋەيت"</item>
+ <item>"نايروبى"</item>
+ <item>"تېھران"</item>
+ <item>"باكۇ"</item>
+ <item>"تىبىلىس"</item>
+ <item>"يېرېۋان"</item>
+ <item>"دۇبەي"</item>
+ <item>"كابۇل"</item>
+ <item>"ئىسلامئاباد، كاراچى"</item>
+ <item>"ئورال"</item>
+ <item>"يېكاتېرىنبۇرگ"</item>
+ <item>"كالكۇتتا"</item>
+ <item>"سىرىلانكا"</item>
+ <item>"كاتماندۇ"</item>
+ <item>"ئاستانا"</item>
+ <item>"رانگون"</item>
+ <item>"كىراسنويارسك"</item>
+ <item>"باڭكوك"</item>
+ <item>"بېيجىڭ"</item>
+ <item>"شياڭگاڭ"</item>
+ <item>"ئىركۇتسك"</item>
+ <item>"كۇئالالۇمپۇر"</item>
+ <item>"پېرت"</item>
+ <item>"تەيبېي"</item>
+ <item>"سېئۇل"</item>
+ <item>"توكيو، ئوساكا"</item>
+ <item>"ياكۇتسك"</item>
+ <item>"ئادېلايدې"</item>
+ <item>"دارۋىن"</item>
+ <item>"بىرىسبان"</item>
+ <item>"خوبارت"</item>
+ <item>"سىدنېي، كانبېررا"</item>
+ <item>"ۋىلادىۋوستوك"</item>
+ <item>"گۇئام"</item>
+ <item>"ماگادان"</item>
+ <item>"ئاۋكلاند"</item>
+ <item>"فىجى"</item>
+ <item>"تونگا"</item>
+ <item>"جاكارتا"</item>
+ </string-array>
+ <string name="shortcut_start_stopwatch_short">باشلا</string>
+ <string name="timers_in_use"><xliff:g id="NUMBER">%d</xliff:g> ۋاقىت خاتىرىلىگۈچ</string>
+ <string name="next_timer_notif">كېيىنكى ۋاقىت خاتىرىلىگۈچ: <xliff:g id="TIME_REMAINING">%s</xliff:g></string>
+ <string name="night_mode_title">كېچە ھالىتى</string>
+ <string name="night_mode_summary">ئېكران يورۇقلۇقىنى بەك تۆۋەن تەڭشەيدۇ (قاراڭغۇ ئۆيگە ماس كېلىدۇ)</string>
+ <string name="expand_alarm">قوڭغۇراقنى ياي</string>
+ <string name="collapse_alarm">قوڭغۇراقنى يىغ</string>
+ <string name="alarm_undo">يېنىۋال</string>
+ <string name="world_day_of_week_label">/ <xliff:g id="LABEL">%s</xliff:g></string>
+ <string name="next_alarm_description">كېيىنكى قوڭغۇراق: <xliff:g id="ALARM_TIME">%s</xliff:g></string>
+ <string name="no_alarms">قوڭغۇراقلىق سائەت يوق</string>
+</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3009f1b..17955e3 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> хв</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Пропущено таймер: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Призупинити"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Скинути таймери"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index ae87fc6..f3d2a55 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> منٹ</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ٹائمر چھوٹ گیا: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"موقوف کریں"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"تمام ٹائمرز دوبارہ ترتیب دیں"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="SECONDS">%02d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="HOURS">%d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="SECONDS">%02d</xliff:g>:<xliff:g id="MINUTES">%d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="SECONDS">%1$02d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="HOURS">%3$d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="SECONDS">%1$02d</xliff:g>:<xliff:g id="MINUTES">%2$d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 8bb1067..d5cef1e 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Bugun"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"O‘chirish"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Javobsiz qoldirilgan signal"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> – <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Kechiktirildi"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> daq</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"O‘tib ketgan taymer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pauza"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Nolga qaytarish"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-v23/styles.xml b/res/values-v23/styles.xml
index 1ac2abd..34dcf5d 100644
--- a/res/values-v23/styles.xml
+++ b/res/values-v23/styles.xml
@@ -18,9 +18,10 @@
<resources>
<style name="widget_big_thin" parent="big_thin">
- <item name="android:fontFamily">sans-serif-light</item>
+ <item name="android:fontFamily">sans-serif-thin</item>
<item name="android:shadowRadius">@dimen/widget_shadow_radius</item>
<item name="android:shadowColor">@color/widget_shadow_color</item>
+ <item name="android:shadowDx">@dimen/widget_shadow_dx</item>
<item name="android:shadowDy">@dimen/widget_shadow_dy</item>
</style>
@@ -29,6 +30,7 @@
<item name="android:letterSpacing">0.15</item>
<item name="android:shadowRadius">@dimen/widget_shadow_radius</item>
<item name="android:shadowColor">@color/widget_shadow_color</item>
+ <item name="android:shadowDx">@dimen/widget_shadow_dx</item>
<item name="android:shadowDy">@dimen/widget_shadow_dy</item>
</style>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
new file mode 100644
index 0000000..313cb21
--- /dev/null
+++ b/res/values-vi/cm_strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">Hành động lật thiết bị</string>
+ <string name="shake_action_title">Hành động lắc thiết bị</string>
+ <string-array name="action_setting_entries">
+ <item>Báo lại</item>
+ <item>Loại bỏ</item>
+ <item>Không có</item>
+ </string-array>
+</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index fc43897..57b96c1 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Hôm nay"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Loại bỏ"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Báo thức bị nhỡ"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Được báo lại"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> phút</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Bộ hẹn giờ bị nhỡ: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Tạm dừng"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Đặt lại hẹn giờ"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
new file mode 100644
index 0000000..5d1ab4a
--- /dev/null
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">设备翻转行为</string>
+ <string name="shake_action_title">设备摇晃行为</string>
+ <string-array name="action_setting_entries">
+ <item>贪睡</item>
+ <item>忽略</item>
+ <item>无</item>
+ </string-array>
+ <string name="firing_alarms_timers_channel">触发闹钟和计时器</string>
+ <string name="alarm_missed_channel">错过的闹钟</string>
+ <string name="alarm_snooze_channel">暂停的闹钟</string>
+ <string name="alarm_upcoming_channel">即将响铃的闹钟</string>
+ <string name="stopwatch_channel">计时器</string>
+ <string name="timer_channel">计时器</string>
+</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ac7b815..a7401af 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> 分钟</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"错过的定时器：<xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"暂停"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"重置所有定时器"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index d8ab91c..e270c16 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> 分鐘</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"已錯失的計時：<xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"暫停"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"重設所有計時器"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
new file mode 100644
index 0000000..19fbcdf
--- /dev/null
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="flip_action_title">裝置翻轉動作</string>
+ <string name="shake_action_title">裝置搖動動作</string>
+ <string-array name="action_setting_entries">
+ <item>延遲</item>
+ <item>忽略</item>
+ <item>無</item>
+ </string-array>
+</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index bad149b..d93d560 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -37,7 +37,7 @@
<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">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</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>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> 分鐘</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"錯過的計時器：<xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"暫停"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"重設所有計時器"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1a8e15c..3573da6 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Namhlanje"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Cashisa"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"I-Alamu ekuphuthele"</string>
- <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
+ <string name="alarm_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">"Kusnuziwe"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> amaminithi</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Isibali sikhathi esiphuthelwe: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Misa isikhashana"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Setha kabusha zonke izibali sikhathi"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <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">
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
new file mode 100644
index 0000000..2d5184a
--- /dev/null
+++ b/res/values/cm_strings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2016 The CyanogenMod Project
+ Copyright (C) 2017-2018 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- Setting title for the flip action setting. -->
+ <string name="flip_action_title">Device flip action</string>
+
+ <!-- Setting title for the shake action setting. -->
+ <string name="shake_action_title">Device shake action</string>
+
+ <!-- Entries listed in the setting flip and shake. -->
+ <string-array name="action_setting_entries">
+ <item>Snooze</item>
+ <item>Dismiss</item>
+ <item>Nothing</item>
+ </string-array>
+
+ <!-- Strings for notification channel. -->
+ <string name="firing_alarms_timers_channel">Firing alarms & timers</string>
+ <string name="alarm_missed_channel">Missed alarms</string>
+ <string name="alarm_snooze_channel">Snoozed alarms</string>
+ <string name="alarm_upcoming_channel">Upcoming alarms</string>
+ <string name="stopwatch_channel">Stopwatch</string>
+ <string name="timer_channel">Timer</string>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 19db824..519b470 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -24,6 +24,7 @@
<color name="white">#FFFFFFFF</color>
<color name="white_08p">#14FFFFFF</color>
<color name="white_63p">#A0FFFFFF</color>
+ <color name="white_50p">#80FFFFFF</color>
<color name="no_alarms">#4CFFFFFF</color>
<color name="transparent">#00000000</color>
@@ -35,5 +36,8 @@
<color name="default_background">#1A237E</color>
<!-- shadowColor for widget text -->
- <color name="widget_shadow_color">#67000000</color>
+ <color name="widget_shadow_color">#000000</color>
+
+ <color name="accent_color">#FFEB40</color>
+ <color name="secondary_color">#2F378A</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 06931fa..6a384e9 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -52,7 +52,8 @@
<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">32sp</dimen>
+ <dimen name="timer_setup_digit_font_size">42sp</dimen>
+ <dimen name="timer_setup_top_size">120dip</dimen>
<dimen name="alarm_picker_dialog_horizontal_margin">30dp</dimen>
<dimen name="alarm_picker_dialog_vertical_margin">20dp</dimen>
@@ -72,12 +73,6 @@
<dimen name="label_margin_big">4dp</dimen>
- <!--margin should be ~ half timer_setup_font_size -->
- <dimen name="timer_setup_delete_margin">14sp</dimen>
-
- <!-- Specified in sp to match the top margin of the time on the adjacent world clock tab. -->
- <dimen name="timer_setup_top_margin">18sp</dimen>
-
<dimen name="cities_list_item_height">56dip</dimen>
<!-- Size of margin for circles. -->
@@ -105,6 +100,7 @@
<!-- shadow styles for widget text with drop shadows -->
<item name="widget_shadow_radius" format="float" type="dimen">2.75</item>
+ <item name="widget_shadow_dx" format="float" type="dimen">2.0</item>
<item name="widget_shadow_dy" format="float" type="dimen">2.0</item>
<!-- Divider height -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ac80b4e..443d182 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -81,7 +81,7 @@
unattended for a number of minutes. It tells the user that
the alarm has been silenced.-->
<string name="alarm_missed_title">Missed alarm</string>
- <string name="alarm_missed_text"><xliff:g id="alarm_time">%s</xliff:g> - <xliff:g id="alarm_label">%s</xliff:g></string>
+ <string name="alarm_missed_text"><xliff:g id="alarm_time">%1$s</xliff:g> - <xliff:g id="alarm_label">%2$s</xliff:g></string>
<!-- The text shown after user snoozed an alerting alarm. The text will be shown
together with the number of minutes in two separate lines. For example:
@@ -588,8 +588,8 @@
<!-- Describes the purpose of the notification button to reset all running timers. [CHAR LIMIT=31] -->
<string name="timer_reset_all">Reset all timers</string>
- <string name="hours_minutes_seconds"><xliff:g id="hours" example="2">%d</xliff:g>:<xliff:g id="minutes" example="3">%02d</xliff:g>:<xliff:g id="seconds" example="44">%02d</xliff:g></string>
- <string name="minutes_seconds"><xliff:g id="minutes" example="3">%d</xliff:g>:<xliff:g id="seconds" example="44">%02d</xliff:g></string>
+ <string name="hours_minutes_seconds"><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"><xliff:g id="minutes" example="3">%1$d</xliff:g>:<xliff:g id="seconds" example="44">%2$02d</xliff:g></string>
<string name="seconds"><xliff:g id="seconds" example="44">%d</xliff:g></string>
<!-- Jocular content that user may append when sharing the lap times -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d4de3c9..fbe62ae 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -26,6 +26,7 @@
<item name="android:fontFamily">sans-serif-thin</item>
<item name="android:shadowRadius">@dimen/widget_shadow_radius</item>
<item name="android:shadowColor">@color/widget_shadow_color</item>
+ <item name="android:shadowDx">@dimen/widget_shadow_dx</item>
<item name="android:shadowDy">@dimen/widget_shadow_dy</item>
</style>
@@ -36,6 +37,7 @@
<style name="widget_label" parent="label">
<item name="android:shadowRadius">@dimen/widget_shadow_radius</item>
<item name="android:shadowColor">@color/widget_shadow_color</item>
+ <item name="android:shadowDx">@dimen/widget_shadow_dx</item>
<item name="android:shadowDy">@dimen/widget_shadow_dy</item>
</style>
@@ -70,6 +72,7 @@
<style name="widget_big_thin" parent="big_thin">
<item name="android:shadowRadius">@dimen/widget_shadow_radius</item>
<item name="android:shadowColor">@color/widget_shadow_color</item>
+ <item name="android:shadowDx">@dimen/widget_shadow_dx</item>
<item name="android:shadowDy">@dimen/widget_shadow_dy</item>
</style>
@@ -95,8 +98,7 @@
<style name="SecondaryLabelTextAppearance" parent="SecondaryLabelTextParentAppearance" />
- <style name="TextAppearance.Tab" parent="TextAppearance.Design.Tab">
- <item name="android:fontFamily">sans-serif-medium</item>
+ <style name="navText">
<item name="android:textSize">12sp</item>
</style>
@@ -130,7 +132,6 @@
<item name="android:headerBackground">@android:color/transparent</item>
<item name="android:numbersBackgroundColor">@android:color/transparent</item>
<item name="android:numbersSelectorColor">?attr/colorAccent</item>
- <item name="android:numbersTextColor">?android:attr/textColorPrimary</item>
</style>
</resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index c1681ee..63216f4 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -28,7 +28,7 @@
<item name="android:windowContentOverlay">@null</item>
<!-- Attributes from androidx.appcompat.appcompat -->
- <item name="colorAccent">#DA4336</item>
+ <item name="colorAccent">@color/accent_color</item>
<item name="colorBackgroundFloating">#303030</item>
<item name="colorControlActivated">@android:color/white</item>
<item name="colorControlNormal">?android:attr/textColorPrimary</item>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 73c3359..6e65a3e 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -68,7 +68,8 @@
<com.android.deskclock.settings.AlarmVolumePreference
android:key="volume_setting"
android:layout="@layout/alarm_volume_preference"
- android:title="@string/alarm_volume_title" />
+ android:title="@string/alarm_volume_title"
+ android:icon="@drawable/ic_alarm_small" />
<ListPreference
android:defaultValue="0"
@@ -87,6 +88,22 @@
android:title="@string/volume_button_setting_title" />
<com.android.deskclock.settings.SimpleMenuPreference
+ android:defaultValue="0"
+ android:dialogTitle="@string/flip_action_title"
+ android:entries="@array/action_setting_entries"
+ android:entryValues="@array/volume_button_setting_values"
+ android:key="flip_action"
+ android:title="@string/flip_action_title" />
+
+ <com.android.deskclock.settings.SimpleMenuPreference
+ android:defaultValue="0"
+ android:dialogTitle="@string/shake_action_title"
+ android:entries="@array/action_setting_entries"
+ android:entryValues="@array/volume_button_setting_values"
+ android:key="shake_action"
+ android:title="@string/shake_action_title" />
+
+ <com.android.deskclock.settings.SimpleMenuPreference
android:dialogTitle="@string/week_start_title"
android:entries="@array/week_start_entries"
android:entryValues="@array/week_start_values"
@@ -115,4 +132,4 @@
android:title="@string/timer_vibrate_title" />
</PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/src/com/android/deskclock/AlarmClockFragment.java b/src/com/android/deskclock/AlarmClockFragment.java
index 5c02d03..859a977 100644
--- a/src/com/android/deskclock/AlarmClockFragment.java
+++ b/src/com/android/deskclock/AlarmClockFragment.java
@@ -16,24 +16,24 @@
package com.android.deskclock;
-import android.app.LoaderManager;
import android.content.Context;
import android.content.Intent;
-import android.content.Loader;
import android.database.Cursor;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.SystemClock;
-import androidx.annotation.NonNull;
-import com.google.android.material.snackbar.Snackbar;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.loader.content.CursorLoader;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import com.android.deskclock.alarms.AlarmTimeClickHandler;
import com.android.deskclock.alarms.AlarmUpdateHandler;
@@ -48,6 +48,7 @@
import com.android.deskclock.widget.EmptyViewController;
import com.android.deskclock.widget.toast.SnackbarManager;
import com.android.deskclock.widget.toast.ToastManager;
+import com.google.android.material.snackbar.Snackbar;
import java.util.ArrayList;
import java.util.List;
@@ -80,7 +81,7 @@
private RecyclerView mRecyclerView;
// Data
- private Loader mCursorLoader;
+ private CursorLoader mCursorLoader;
private long mScrollToAlarmId = Alarm.INVALID_ID;
private long mExpandedAlarmId = Alarm.INVALID_ID;
private long mCurrentUpdateToken;
@@ -102,7 +103,7 @@
@Override
public void onCreate(Bundle savedState) {
super.onCreate(savedState);
- mCursorLoader = getLoaderManager().initLoader(0, null, this);
+ mCursorLoader = (CursorLoader) LoaderManager.getInstance(this).initLoader(0, null, this);
if (savedState != null) {
mExpandedAlarmId = savedState.getLong(KEY_EXPANDED_ID, Alarm.INVALID_ID);
}
@@ -391,7 +392,7 @@
@Override
public void onUpdateFab(@NonNull ImageView fab) {
fab.setVisibility(View.VISIBLE);
- fab.setImageResource(R.drawable.ic_add_white_24dp);
+ fab.setImageResource(R.drawable.ic_add_24dp);
fab.setContentDescription(fab.getResources().getString(R.string.button_alarms));
}
@@ -401,6 +402,11 @@
right.setVisibility(View.INVISIBLE);
}
+ @Override
+ public final int getFabTargetVisibility() {
+ return View.VISIBLE;
+ }
+
private void startCreatingAlarm() {
// Clear the currently selected alarm.
mAlarmTimeClickHandler.setSelectedAlarm(null);
diff --git a/src/com/android/deskclock/AlarmInitReceiver.java b/src/com/android/deskclock/AlarmInitReceiver.java
index 8bd7cde..24ba864 100644
--- a/src/com/android/deskclock/AlarmInitReceiver.java
+++ b/src/com/android/deskclock/AlarmInitReceiver.java
@@ -18,16 +18,33 @@
import android.annotation.SuppressLint;
import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.os.PowerManager.WakeLock;
import com.android.deskclock.alarms.AlarmStateManager;
+import com.android.deskclock.alarms.AlarmNotifications;
import com.android.deskclock.controller.Controller;
import com.android.deskclock.data.DataModel;
+import com.android.deskclock.NotificationUtils;
+import com.android.deskclock.provider.AlarmInstance;
+
+import java.util.Calendar;
+import java.util.List;
public class AlarmInitReceiver extends BroadcastReceiver {
+ private static final String ACTION_UPDATE_ALARM_STATUS =
+ "org.codeaurora.poweroffalarm.action.UPDATE_ALARM";
+
+ private static final int SNOOZE_STATUS = 2;
+ private static final int DISMISS_STATUS = 3;
+
+ private static final String STATUS = "status";
+ private static final String TIME = "time";
+ private static final String SNOOZE_TIME = "snooze_time";
+
/**
* When running on N devices, we're interested in the boot completed event that is sent while
* the user is still locked, so that we can schedule alarms.
@@ -74,6 +91,7 @@
if (Intent.ACTION_BOOT_COMPLETED.equals(action)
|| Intent.ACTION_LOCALE_CHANGED.equals(action)) {
Controller.getController().updateShortcuts();
+ NotificationUtils.updateNotificationChannels(context);
}
// Notifications are canceled by the system on application upgrade. This broadcast signals
@@ -85,6 +103,41 @@
Controller.getController().updateShortcuts();
}
+ // Update alarm status once receive the status update broadcast
+ if (ACTION_UPDATE_ALARM_STATUS.equals(action)) {
+ long alarmTime = intent.getLongExtra(TIME, 0L);
+ int alarmStatus = intent.getIntExtra(STATUS, 0);
+
+ if (alarmTime != 0) {
+ ContentResolver cr = context.getContentResolver();
+ List<AlarmInstance> alarmInstances = AlarmInstance.getInstances(cr, null);
+ AlarmInstance alarmInstance = null;
+ for (AlarmInstance instance : alarmInstances) {
+ if (instance.getAlarmTime().getTimeInMillis() == alarmTime) {
+ alarmInstance = instance;
+ break;
+ }
+ }
+
+ if (alarmInstance != null) {
+ // Update alarm status if the alarm instance is not null
+ if (alarmStatus == DISMISS_STATUS) {
+ AlarmStateManager.setDismissState(context, alarmInstance);
+ } else if (alarmStatus == SNOOZE_STATUS) {
+ long snoozeTime = intent.getLongExtra(SNOOZE_TIME, 0L);
+ if (snoozeTime > System.currentTimeMillis()) {
+ AlarmNotifications.clearNotification(context, alarmInstance);
+ Calendar c = Calendar.getInstance();
+ c.setTimeInMillis(snoozeTime);
+ alarmInstance.setAlarmTime(c);
+ alarmInstance.mAlarmState = AlarmInstance.SNOOZE_STATE;
+ AlarmInstance.updateInstance(cr, alarmInstance);
+ }
+ }
+ }
+ }
+ }
+
AsyncHandler.post(new Runnable() {
@Override
public void run() {
diff --git a/src/com/android/deskclock/ClockFragment.java b/src/com/android/deskclock/ClockFragment.java
index 1536b55..b487e52 100644
--- a/src/com/android/deskclock/ClockFragment.java
+++ b/src/com/android/deskclock/ClockFragment.java
@@ -215,6 +215,11 @@
right.setVisibility(INVISIBLE);
}
+ @Override
+ public final int getFabTargetVisibility() {
+ return View.VISIBLE;
+ }
+
/**
* Refresh the next alarm time.
*/
diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index e53fbeb..35899aa 100644
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java
@@ -20,17 +20,10 @@
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ValueAnimator;
-import android.app.Fragment;
import android.content.Intent;
+import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import androidx.annotation.StringRes;
-import com.google.android.material.snackbar.Snackbar;
-import com.google.android.material.tabs.TabLayout;
-import androidx.viewpager.widget.ViewPager;
-import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.widget.Toolbar;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
@@ -39,6 +32,13 @@
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
import com.android.deskclock.actionbarmenu.MenuItemControllerFactory;
import com.android.deskclock.actionbarmenu.NightModeMenuItemController;
@@ -48,11 +48,15 @@
import com.android.deskclock.data.DataModel.SilentSetting;
import com.android.deskclock.data.OnSilentSettingsListener;
import com.android.deskclock.events.Events;
+import com.android.deskclock.LogUtils;
import com.android.deskclock.provider.Alarm;
import com.android.deskclock.uidata.TabListener;
import com.android.deskclock.uidata.UiDataModel;
import com.android.deskclock.widget.toast.SnackbarManager;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.google.android.material.snackbar.Snackbar;
+
import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_DRAGGING;
import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_IDLE;
import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_SETTLING;
@@ -84,9 +88,6 @@
/** Hides, updates, and shows only the {@link #mLeftButton} and {@link #mRightButton}. */
private final AnimatorSet mUpdateButtonsOnlyAnimation = new AnimatorSet();
- /** Automatically starts the {@link #mShowAnimation} after {@link #mHideAnimation} ends. */
- private final AnimatorListenerAdapter mAutoStartShowListener = new AutoStartShowListener();
-
/** Updates the user interface to reflect the selected tab from the backing model. */
private final TabListener mTabChangeWatcher = new TabChangeWatcher();
@@ -112,21 +113,25 @@
/** The button right of the {@link #mFab} shared across all tabs in the user interface. */
private Button mRightButton;
- /** The controller that shows the drop shadow when content is not scrolled to the top. */
- private DropShadowController mDropShadowController;
-
/** The ViewPager that pages through the fragments representing the content of the tabs. */
private ViewPager mFragmentTabPager;
- /** Generates the fragments that are displayed by the {@link #mFragmentTabPager}. */
- private FragmentTabPagerAdapter mFragmentTabPagerAdapter;
+ /** The view that displays the current tab's title */
+ private TextView mTitleView;
- /** The container that stores the tab headers. */
- private TabLayout mTabLayout;
+ /** The bottom navigation bar */
+ private BottomNavigationView mBottomNavigation;
+
+ private FragmentUtils mFragmentUtils;
/** {@code true} when a settings change necessitates recreating this activity. */
private boolean mRecreateActivity;
+ private static final String PERMISSION_POWER_OFF_ALARM =
+ "org.codeaurora.permission.POWER_OFF_ALARM";
+
+ private static final int CODE_FOR_ALARM_PERMISSION = 1;
+
@Override
public void onNewIntent(Intent newIntent) {
super.onNewIntent(newIntent);
@@ -142,6 +147,8 @@
setContentView(R.layout.desk_clock);
mSnackbarAnchor = findViewById(R.id.content);
+ checkPermissions();
+
// Configure the toolbar.
final Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
@@ -161,43 +168,6 @@
// inflation occurs *after* the initial draw and a second layout pass adds in the menu.
onCreateOptionsMenu(toolbar.getMenu());
- // Create the tabs that make up the user interface.
- mTabLayout = (TabLayout) findViewById(R.id.tabs);
- final int tabCount = UiDataModel.getUiDataModel().getTabCount();
- final boolean showTabLabel = getResources().getBoolean(R.bool.showTabLabel);
- final boolean showTabHorizontally = getResources().getBoolean(R.bool.showTabHorizontally);
- for (int i = 0; i < tabCount; i++) {
- final UiDataModel.Tab tabModel = UiDataModel.getUiDataModel().getTab(i);
- final @StringRes int labelResId = tabModel.getLabelResId();
-
- final TabLayout.Tab tab = mTabLayout.newTab()
- .setTag(tabModel)
- .setIcon(tabModel.getIconResId())
- .setContentDescription(labelResId);
-
- if (showTabLabel) {
- tab.setText(labelResId);
- tab.setCustomView(R.layout.tab_item);
-
- @SuppressWarnings("ConstantConditions")
- final TextView text = (TextView) tab.getCustomView()
- .findViewById(android.R.id.text1);
- text.setTextColor(mTabLayout.getTabTextColors());
-
- // Bind the icon to the TextView.
- final Drawable icon = tab.getIcon();
- if (showTabHorizontally) {
- // Remove the icon so it doesn't affect the minimum TabLayout height.
- tab.setIcon(null);
- text.setCompoundDrawablesRelativeWithIntrinsicBounds(icon, null, null, null);
- } else {
- text.setCompoundDrawablesRelativeWithIntrinsicBounds(null, icon, null, null);
- }
- }
-
- mTabLayout.addTab(tab);
- }
-
// Configure the buttons shared by the tabs.
mFab = (ImageView) findViewById(R.id.fab);
mLeftButton = (Button) findViewById(R.id.left_button);
@@ -274,53 +244,74 @@
.after(leftHideAnimation)
.after(rightHideAnimation);
- // Customize the view pager.
- mFragmentTabPagerAdapter = new FragmentTabPagerAdapter(this);
- mFragmentTabPager = (ViewPager) findViewById(R.id.desk_clock_pager);
- // Keep all four tabs to minimize jank.
- mFragmentTabPager.setOffscreenPageLimit(3);
- // Set Accessibility Delegate to null so view pager doesn't intercept movements and
- // prevent the fab from being selected.
- mFragmentTabPager.setAccessibilityDelegate(null);
- // Mirror changes made to the selected page of the view pager into UiDataModel.
- mFragmentTabPager.addOnPageChangeListener(new PageChangeWatcher());
- mFragmentTabPager.setAdapter(mFragmentTabPagerAdapter);
-
+ mFragmentUtils = new FragmentUtils(this);
// Mirror changes made to the selected tab into UiDataModel.
- mTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
- @Override
- public void onTabSelected(TabLayout.Tab tab) {
- UiDataModel.getUiDataModel().setSelectedTab((UiDataModel.Tab) tab.getTag());
- }
-
- @Override
- public void onTabUnselected(TabLayout.Tab tab) {
- }
-
- @Override
- public void onTabReselected(TabLayout.Tab tab) {
- }
- });
+ mBottomNavigation = findViewById(R.id.bottom_view);
+ mBottomNavigation.setOnNavigationItemSelectedListener(mNavigationListener);
// Honor changes to the selected tab from outside entities.
UiDataModel.getUiDataModel().addTabListener(mTabChangeWatcher);
+
+ mTitleView = findViewById(R.id.title_view);
}
+ private BottomNavigationView.OnNavigationItemSelectedListener mNavigationListener
+ = new BottomNavigationView.OnNavigationItemSelectedListener() {
+
+ @Override
+ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
+ UiDataModel.Tab selectedTab = null;
+ switch (item.getItemId()) {
+ case R.id.page_alarm:
+ selectedTab = UiDataModel.Tab.ALARMS;
+ break;
+
+ case R.id.page_clock:
+ selectedTab = UiDataModel.Tab.CLOCKS;
+ break;
+
+ case R.id.page_timer:
+ selectedTab = UiDataModel.Tab.TIMERS;
+ break;
+
+ case R.id.page_stopwatch:
+ selectedTab = UiDataModel.Tab.STOPWATCH;
+ break;
+ }
+
+ if (selectedTab != null) {
+ UiDataModel.Tab currentTab = UiDataModel.getUiDataModel().getSelectedTab();
+ DeskClockFragment currentFrag = mFragmentUtils.getDeskClockFragment(currentTab);
+ DeskClockFragment selectedFrag = mFragmentUtils.getDeskClockFragment(selectedTab);
+
+ int currentVisibility = currentFrag.getFabTargetVisibility();
+ int targetVisibility = selectedFrag.getFabTargetVisibility();
+ if (currentVisibility != targetVisibility) {
+ if (targetVisibility == View.VISIBLE) {
+ mShowAnimation.start();
+ } else {
+ mHideAnimation.start();
+ }
+ }
+ UiDataModel.getUiDataModel().setSelectedTab(selectedTab);
+ return true;
+ }
+
+ return false;
+ }
+ };
+
@Override
protected void onStart() {
- super.onStart();
DataModel.getDataModel().addSilentSettingsListener(mSilentSettingChangeWatcher);
DataModel.getDataModel().setApplicationInForeground(true);
+ super.onStart();
}
@Override
protected void onResume() {
super.onResume();
- final View dropShadow = findViewById(R.id.drop_shadow);
- mDropShadowController = new DropShadowController(dropShadow, UiDataModel.getUiDataModel(),
- mSnackbarAnchor.findViewById(R.id.tab_hairline));
-
// ViewPager does not save state; this honors the selected tab in the user interface.
updateCurrentTab();
}
@@ -331,29 +322,10 @@
if (mRecreateActivity) {
mRecreateActivity = false;
-
- // A runnable must be posted here or the new DeskClock activity will be recreated in a
- // paused state, even though it is the foreground activity.
- mFragmentTabPager.post(new Runnable() {
- @Override
- public void run() {
- recreate();
- }
- });
}
}
@Override
- public void onPause() {
- if (mDropShadowController != null) {
- mDropShadowController.stop();
- mDropShadowController = null;
- }
-
- super.onPause();
- }
-
- @Override
protected void onStop() {
DataModel.getDataModel().removeSilentSettingsListener(mSilentSettingChangeWatcher);
if (!isChangingConfigurations()) {
@@ -392,7 +364,7 @@
*/
@Override
public void onDialogLabelSet(Alarm alarm, String label, String tag) {
- final Fragment frag = getFragmentManager().findFragmentByTag(tag);
+ final Fragment frag = getSupportFragmentManager().findFragmentByTag(tag);
if (frag instanceof AlarmClockFragment) {
((AlarmClockFragment) frag).setLabel(alarm, label);
}
@@ -461,45 +433,39 @@
}
}
+ private void checkPermissions() {
+ if (checkSelfPermission(PERMISSION_POWER_OFF_ALARM)
+ != PackageManager.PERMISSION_GRANTED) {
+ requestPermissions(new String[]{PERMISSION_POWER_OFF_ALARM}, CODE_FOR_ALARM_PERMISSION);
+ }
+ }
+
+ @Override
+ public void onRequestPermissionsResult(int requestCode,
+ String permissions[], int[] grantResults) {
+ if (requestCode == CODE_FOR_ALARM_PERMISSION){
+ LogUtils.i("Power off alarm permission is granted.");
+ }
+ }
+
/**
- * Configure the {@link #mFragmentTabPager} and {@link #mTabLayout} to display UiDataModel's
- * selected tab.
+ * Configure the {@link #mFragmentTabPager} and {@link #mBottomNavigation} to display
+ * UiDataModel's selected tab.
*/
private void updateCurrentTab() {
// Fetch the selected tab from the source of truth: UiDataModel.
final UiDataModel.Tab selectedTab = UiDataModel.getUiDataModel().getSelectedTab();
-
- // Update the selected tab in the tablayout if it does not agree with UiDataModel.
- for (int i = 0; i < mTabLayout.getTabCount(); i++) {
- final TabLayout.Tab tab = mTabLayout.getTabAt(i);
- if (tab != null && tab.getTag() == selectedTab && !tab.isSelected()) {
- tab.select();
- break;
- }
- }
-
- // Update the selected fragment in the viewpager if it does not agree with UiDataModel.
- for (int i = 0; i < mFragmentTabPagerAdapter.getCount(); i++) {
- final DeskClockFragment fragment = mFragmentTabPagerAdapter.getDeskClockFragment(i);
- if (fragment.isTabSelected() && mFragmentTabPager.getCurrentItem() != i) {
- mFragmentTabPager.setCurrentItem(i);
- break;
- }
- }
+ // Update the selected tab in the mBottomNavigation if it does not agree with UiDataModel.
+ mBottomNavigation.setSelectedItemId(selectedTab.getPageResId());
+ mFragmentUtils.showFragment(selectedTab);
+ mTitleView.setText(selectedTab.getLabelResId());
}
/**
* @return the DeskClockFragment that is currently selected according to UiDataModel
*/
private DeskClockFragment getSelectedDeskClockFragment() {
- for (int i = 0; i < mFragmentTabPagerAdapter.getCount(); i++) {
- final DeskClockFragment fragment = mFragmentTabPagerAdapter.getDeskClockFragment(i);
- if (fragment.isTabSelected()) {
- return fragment;
- }
- }
- final UiDataModel.Tab selectedTab = UiDataModel.getUiDataModel().getSelectedTab();
- throw new IllegalStateException("Unable to locate selected fragment (" + selectedTab + ")");
+ return mFragmentUtils.getCurrentFragment();
}
/**
@@ -510,93 +476,6 @@
}
/**
- * As the view pager changes the selected page, update the model to record the new selected tab.
- */
- private final class PageChangeWatcher implements OnPageChangeListener {
-
- /** The last reported page scroll state; used to detect exotic state changes. */
- private int mPriorState = SCROLL_STATE_IDLE;
-
- public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
- // Only hide the fab when a non-zero drag distance is detected. This prevents
- // over-scrolling from needlessly hiding the fab.
- if (mFabState == FabState.HIDE_ARMED && positionOffsetPixels != 0) {
- mFabState = FabState.HIDING;
- mHideAnimation.start();
- }
- }
-
- @Override
- public void onPageScrollStateChanged(int state) {
- if (mPriorState == SCROLL_STATE_IDLE && state == SCROLL_STATE_SETTLING) {
- // The user has tapped a tab button; play the hide and show animations linearly.
- mHideAnimation.addListener(mAutoStartShowListener);
- mHideAnimation.start();
- mFabState = FabState.HIDING;
- } else if (mPriorState == SCROLL_STATE_SETTLING && state == SCROLL_STATE_DRAGGING) {
- // The user has interrupted settling on a tab and the fab button must be re-hidden.
- if (mShowAnimation.isStarted()) {
- mShowAnimation.cancel();
- }
- if (mHideAnimation.isStarted()) {
- // Let the hide animation finish naturally; don't auto show when it ends.
- mHideAnimation.removeListener(mAutoStartShowListener);
- } else {
- // Start and immediately end the hide animation to jump to the hidden state.
- mHideAnimation.start();
- mHideAnimation.end();
- }
- mFabState = FabState.HIDING;
-
- } else if (state != SCROLL_STATE_DRAGGING && mFabState == FabState.HIDING) {
- // The user has lifted their finger; show the buttons now or after hide ends.
- if (mHideAnimation.isStarted()) {
- // Finish the hide animation and then start the show animation.
- mHideAnimation.addListener(mAutoStartShowListener);
- } else {
- updateFab(FAB_AND_BUTTONS_IMMEDIATE);
- mShowAnimation.start();
-
- // The animation to show the fab has begun; update the state to showing.
- mFabState = FabState.SHOWING;
- }
- } else if (state == SCROLL_STATE_DRAGGING) {
- // The user has started a drag so arm the hide animation.
- mFabState = FabState.HIDE_ARMED;
- }
-
- // Update the last known state.
- mPriorState = state;
- }
-
- @Override
- public void onPageSelected(int position) {
- mFragmentTabPagerAdapter.getDeskClockFragment(position).selectTab();
- }
- }
-
- /**
- * If this listener is attached to {@link #mHideAnimation} when it ends, the corresponding
- * {@link #mShowAnimation} is automatically started.
- */
- private final class AutoStartShowListener extends AnimatorListenerAdapter {
- @Override
- public void onAnimationEnd(Animator animation) {
- // Prepare the hide animation for its next use; by default do not auto-show after hide.
- mHideAnimation.removeListener(mAutoStartShowListener);
-
- // Update the buttons now that they are no longer visible.
- updateFab(FAB_AND_BUTTONS_IMMEDIATE);
-
- // Automatically start the grow animation now that shrinking is complete.
- mShowAnimation.start();
-
- // The animation to show the fab has begun; update the state to showing.
- mFabState = FabState.SHOWING;
- }
- }
-
- /**
* Shows/hides a snackbar as silencing settings are enabled/disabled.
*/
private final class SilentSettingChangeWatcher implements OnSilentSettingsListener {
diff --git a/src/com/android/deskclock/DeskClockFragment.java b/src/com/android/deskclock/DeskClockFragment.java
index a9e3fc6..1f51a33 100644
--- a/src/com/android/deskclock/DeskClockFragment.java
+++ b/src/com/android/deskclock/DeskClockFragment.java
@@ -16,12 +16,12 @@
package com.android.deskclock;
-import android.app.Fragment;
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
import android.view.KeyEvent;
import android.widget.Button;
import android.widget.ImageView;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
import com.android.deskclock.uidata.UiDataModel;
import com.android.deskclock.uidata.UiDataModel.Tab;
diff --git a/src/com/android/deskclock/FabController.java b/src/com/android/deskclock/FabController.java
index bab7f46..11c5d53 100644
--- a/src/com/android/deskclock/FabController.java
+++ b/src/com/android/deskclock/FabController.java
@@ -57,4 +57,10 @@
* @param right the button to the right of the fab component
*/
void onRightButtonClick(@NonNull Button right);
-}
\ No newline at end of file
+
+ /**
+ *
+ * @return the target visibility of the FAB component
+ */
+ int getFabTargetVisibility();
+}
diff --git a/src/com/android/deskclock/FragmentTabPagerAdapter.java b/src/com/android/deskclock/FragmentTabPagerAdapter.java
deleted file mode 100644
index 3682c86..0000000
--- a/src/com/android/deskclock/FragmentTabPagerAdapter.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.deskclock;
-
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import androidx.legacy.app.FragmentCompat;
-import androidx.viewpager.widget.PagerAdapter;
-import android.util.ArrayMap;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.deskclock.uidata.UiDataModel;
-
-import java.util.Map;
-
-/**
- * This adapter produces the DeskClockFragments that are the content of the DeskClock tabs. The
- * adapter presents the tabs in LTR and RTL order depending on the text layout direction for the
- * current locale. To prevent issues when switching between LTR and RTL, fragments are registered
- * with the manager using position-independent tags, which is an important departure from
- * FragmentPagerAdapter.
- */
-final class FragmentTabPagerAdapter extends PagerAdapter {
-
- private final DeskClock mDeskClock;
-
- /** The manager into which fragments are added. */
- private final FragmentManager mFragmentManager;
-
- /** A fragment cache that can be accessed before {@link #instantiateItem} is called. */
- private final Map<UiDataModel.Tab, DeskClockFragment> mFragmentCache;
-
- /** The active fragment transaction if one exists. */
- private FragmentTransaction mCurrentTransaction;
-
- /** The current fragment displayed to the user. */
- private Fragment mCurrentPrimaryItem;
-
- FragmentTabPagerAdapter(DeskClock deskClock) {
- mDeskClock = deskClock;
- mFragmentCache = new ArrayMap<>(getCount());
- mFragmentManager = deskClock.getFragmentManager();
- }
-
- @Override
- public int getCount() {
- return UiDataModel.getUiDataModel().getTabCount();
- }
-
- /**
- * @param position the left-to-right index of the fragment to be returned
- * @return the fragment displayed at the given {@code position}
- */
- DeskClockFragment getDeskClockFragment(int position) {
- // Fetch the tab the UiDataModel reports for the position.
- final UiDataModel.Tab tab = UiDataModel.getUiDataModel().getTabAt(position);
-
- // First check the local cache for the fragment.
- DeskClockFragment fragment = mFragmentCache.get(tab);
- if (fragment != null) {
- return fragment;
- }
-
- // Next check the fragment manager; relevant when app is rebuilt after locale changes
- // because this adapter will be new and mFragmentCache will be empty, but the fragment
- // manager will retain the Fragments built on original application launch.
- fragment = (DeskClockFragment) mFragmentManager.findFragmentByTag(tab.name());
- if (fragment != null) {
- fragment.setFabContainer(mDeskClock);
- mFragmentCache.put(tab, fragment);
- return fragment;
- }
-
- // Otherwise, build the fragment from scratch.
- final String fragmentClassName = tab.getFragmentClassName();
- fragment = (DeskClockFragment) Fragment.instantiate(mDeskClock, fragmentClassName);
- fragment.setFabContainer(mDeskClock);
- mFragmentCache.put(tab, fragment);
- return fragment;
- }
-
- @Override
- public void startUpdate(ViewGroup container) {
- if (container.getId() == View.NO_ID) {
- throw new IllegalStateException("ViewPager with adapter " + this + " has no id");
- }
- }
-
- @Override
- public Object instantiateItem(ViewGroup container, int position) {
- if (mCurrentTransaction == null) {
- mCurrentTransaction = mFragmentManager.beginTransaction();
- }
-
- // Use the fragment located in the fragment manager if one exists.
- final UiDataModel.Tab tab = UiDataModel.getUiDataModel().getTabAt(position);
- Fragment fragment = mFragmentManager.findFragmentByTag(tab.name());
- if (fragment != null) {
- mCurrentTransaction.attach(fragment);
- } else {
- fragment = getDeskClockFragment(position);
- mCurrentTransaction.add(container.getId(), fragment, tab.name());
- }
-
- if (fragment != mCurrentPrimaryItem) {
- FragmentCompat.setMenuVisibility(fragment, false);
- FragmentCompat.setUserVisibleHint(fragment, false);
- }
-
- return fragment;
- }
-
- @Override
- public void destroyItem(ViewGroup container, int position, Object object) {
- if (mCurrentTransaction == null) {
- mCurrentTransaction = mFragmentManager.beginTransaction();
- }
- final DeskClockFragment fragment = (DeskClockFragment) object;
- fragment.setFabContainer(null);
- mCurrentTransaction.detach(fragment);
- }
-
- @Override
- public void setPrimaryItem(ViewGroup container, int position, Object object) {
- final Fragment fragment = (Fragment) object;
- if (fragment != mCurrentPrimaryItem) {
- if (mCurrentPrimaryItem != null) {
- FragmentCompat.setMenuVisibility(mCurrentPrimaryItem, false);
- FragmentCompat.setUserVisibleHint(mCurrentPrimaryItem, false);
- }
- if (fragment != null) {
- FragmentCompat.setMenuVisibility(fragment, true);
- FragmentCompat.setUserVisibleHint(fragment, true);
- }
- mCurrentPrimaryItem = fragment;
- }
- }
-
- @Override
- public void finishUpdate(ViewGroup container) {
- if (mCurrentTransaction != null) {
- mCurrentTransaction.commitAllowingStateLoss();
- mCurrentTransaction = null;
- mFragmentManager.executePendingTransactions();
- }
- }
-
- @Override
- public boolean isViewFromObject(View view, Object object) {
- return ((Fragment) object).getView() == view;
- }
-}
\ No newline at end of file
diff --git a/src/com/android/deskclock/FragmentUtils.java b/src/com/android/deskclock/FragmentUtils.java
new file mode 100644
index 0000000..859e1f5
--- /dev/null
+++ b/src/com/android/deskclock/FragmentUtils.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2020 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.deskclock;
+
+import android.util.ArrayMap;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.android.deskclock.uidata.UiDataModel;
+
+import java.util.Map;
+
+/**
+ * This class produces the DeskClockFragments that are the content of the DeskClock tabs.
+ * It presents the tabs in LTR and RTL order depending on the text layout direction for the
+ * current locale. To prevent issues when switching between LTR and RTL, fragments are registered
+ * with the manager using position-independent tags, which is an important departure from
+ * FragmentPagerAdapter.
+ */
+public final class FragmentUtils {
+
+ private final DeskClock mDeskClock;
+
+ /** The manager into which fragments are added. */
+ private final FragmentManager mFragmentManager;
+
+ /** A fragment cache that can be accessed before {@link #instantiateItem} is called. */
+ private final Map<UiDataModel.Tab, DeskClockFragment> mFragmentCache;
+
+ /** The current fragment displayed to the user. */
+ private DeskClockFragment mCurrentPrimaryItem;
+
+ FragmentUtils(DeskClock deskClock) {
+ mDeskClock = deskClock;
+ mFragmentCache = new ArrayMap<>(getCount());
+ mFragmentManager = deskClock.getSupportFragmentManager();
+ }
+
+ private int getCount() {
+ return UiDataModel.getUiDataModel().getTabCount();
+ }
+
+ public DeskClockFragment getDeskClockFragment(UiDataModel.Tab tab) {
+ // First check the local cache for the fragment.
+ DeskClockFragment fragment = mFragmentCache.get(tab);
+ if (fragment != null) {
+ return fragment;
+ }
+
+ // Next check the fragment manager; relevant when app is rebuilt after locale changes
+ // because this adapter will be new and mFragmentCache will be empty, but the fragment
+ // manager will retain the Fragments built on original application launch.
+ fragment = (DeskClockFragment) mFragmentManager.findFragmentByTag(tab.name());
+ if (fragment != null) {
+ fragment.setFabContainer(mDeskClock);
+ mFragmentCache.put(tab, fragment);
+ return fragment;
+ }
+
+ // Otherwise, build the fragment from scratch.
+ final String fragmentClassName = tab.getFragmentClassName();
+ fragment = (DeskClockFragment) Fragment.instantiate(mDeskClock, fragmentClassName);
+ fragment.setFabContainer(mDeskClock);
+
+ FragmentTransaction transaction = mFragmentManager.beginTransaction();
+ transaction.add(R.id.fragment_container, fragment, tab.name());
+ transaction.commit();
+
+ mFragmentCache.put(tab, fragment);
+ return fragment;
+ }
+
+ public void hideAllFragments() {
+ FragmentTransaction transaction = mFragmentManager.beginTransaction();
+ for (UiDataModel.Tab tab : UiDataModel.Tab.values()) {
+ Fragment fragment = mFragmentManager.findFragmentByTag(tab.name());
+ if (fragment != null) {
+ transaction.hide(fragment);
+ }
+ }
+
+ transaction.commit();
+ }
+
+ public void showFragment(UiDataModel.Tab tab) {
+ hideAllFragments();
+ Fragment fragment = getDeskClockFragment(tab);
+ mFragmentManager.beginTransaction().show(fragment).commit();
+ mCurrentPrimaryItem = (DeskClockFragment) fragment;
+ }
+
+ public DeskClockFragment getCurrentFragment() {
+ return mCurrentPrimaryItem;
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/deskclock/LabelDialogFragment.java b/src/com/android/deskclock/LabelDialogFragment.java
index 0fa0eab..eab0545 100644
--- a/src/com/android/deskclock/LabelDialogFragment.java
+++ b/src/com/android/deskclock/LabelDialogFragment.java
@@ -17,16 +17,11 @@
package com.android.deskclock;
import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
import android.content.Context;
import android.content.DialogInterface;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.os.Bundle;
-import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.AppCompatEditText;
import android.text.Editable;
@@ -37,6 +32,11 @@
import android.view.Window;
import android.view.inputmethod.EditorInfo;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
import com.android.deskclock.data.DataModel;
import com.android.deskclock.data.Timer;
diff --git a/src/com/android/deskclock/NotificationUtils.java b/src/com/android/deskclock/NotificationUtils.java
new file mode 100644
index 0000000..1490562
--- /dev/null
+++ b/src/com/android/deskclock/NotificationUtils.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2020 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.deskclock;
+
+import static androidx.core.app.NotificationManagerCompat.IMPORTANCE_DEFAULT;
+import static androidx.core.app.NotificationManagerCompat.IMPORTANCE_HIGH;
+import static androidx.core.app.NotificationManagerCompat.IMPORTANCE_LOW;
+
+import android.app.NotificationChannel;
+import android.content.Context;
+import android.util.ArraySet;
+import android.util.Log;
+import androidx.core.app.NotificationManagerCompat;
+
+import com.android.deskclock.Utils;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class NotificationUtils {
+
+ private static final String TAG = NotificationUtils.class.getSimpleName();
+
+ /**
+ * Notification channel containing all missed alarm notifications.
+ */
+ public static final String ALARM_MISSED_NOTIFICATION_CHANNEL_ID = "alarmMissedNotification";
+
+ /**
+ * Notification channel containing all upcoming alarm notifications.
+ */
+ public static final String ALARM_UPCOMING_NOTIFICATION_CHANNEL_ID = "alarmUpcomingNotification";
+
+ /**
+ * Notification channel containing all snooze notifications.
+ */
+ public static final String ALARM_SNOOZE_NOTIFICATION_CHANNEL_ID = "alarmSnoozingNotification";
+
+ /**
+ * Notification channel containing all firing alarm and timer notifications.
+ */
+ public static final String FIRING_NOTIFICATION_CHANNEL_ID = "firingAlarmsAndTimersNotification";
+
+ /**
+ * Notification channel containing all TimerModel notifications.
+ */
+ public static final String TIMER_MODEL_NOTIFICATION_CHANNEL_ID = "timerNotification";
+
+ /**
+ * Notification channel containing all stopwatch notifications.
+ */
+ public static final String STOPWATCH_NOTIFICATION_CHANNEL_ID = "stopwatchNotification";
+
+ /**
+ * Values used to bitmask certain channel defaults
+ */
+ private static final int PLAY_SOUND = 0x01;
+ private static final int ENABLE_LIGHTS = 0x02;
+ private static final int ENABLE_VIBRATION = 0x04;
+
+ private static Map<String, int[]> CHANNEL_PROPS = new HashMap<String, int[]>();
+ static {
+ CHANNEL_PROPS.put(ALARM_MISSED_NOTIFICATION_CHANNEL_ID, new int[]{
+ R.string.alarm_missed_channel,
+ IMPORTANCE_HIGH
+ });
+ CHANNEL_PROPS.put(ALARM_SNOOZE_NOTIFICATION_CHANNEL_ID, new int[]{
+ R.string.alarm_snooze_channel,
+ IMPORTANCE_LOW
+ });
+ CHANNEL_PROPS.put(ALARM_UPCOMING_NOTIFICATION_CHANNEL_ID, new int[]{
+ R.string.alarm_upcoming_channel,
+ IMPORTANCE_LOW
+ });
+ CHANNEL_PROPS.put(FIRING_NOTIFICATION_CHANNEL_ID, new int[]{
+ R.string.firing_alarms_timers_channel,
+ IMPORTANCE_HIGH,
+ ENABLE_LIGHTS
+ });
+ CHANNEL_PROPS.put(STOPWATCH_NOTIFICATION_CHANNEL_ID, new int[]{
+ R.string.stopwatch_channel,
+ IMPORTANCE_LOW
+ });
+ CHANNEL_PROPS.put(TIMER_MODEL_NOTIFICATION_CHANNEL_ID, new int[]{
+ R.string.timer_channel,
+ IMPORTANCE_LOW
+ });
+ }
+
+ public static void createChannel(Context context, String id) {
+ if (!Utils.isOOrLater()) {
+ return;
+ }
+
+ if (!CHANNEL_PROPS.containsKey(id)) {
+ Log.e(TAG, "Invalid channel requested: " + id);
+ return;
+ }
+
+ int[] properties = (int[]) CHANNEL_PROPS.get(id);
+ int nameId = properties[0];
+ int importance = properties[1];
+ NotificationChannel channel = new NotificationChannel(
+ id, context.getString(nameId), importance);
+ if (properties.length >= 3) {
+ int bits = properties[2];
+ channel.enableLights((bits & ENABLE_LIGHTS) != 0);
+ channel.enableVibration((bits & ENABLE_VIBRATION) != 0);
+ if ((bits & PLAY_SOUND) == 0) {
+ channel.setSound(null, null);
+ }
+ }
+ NotificationManagerCompat nm = NotificationManagerCompat.from(context);
+ nm.createNotificationChannel(channel);
+ }
+
+ private static void deleteChannel(NotificationManagerCompat nm, String channelId) {
+ NotificationChannel channel = nm.getNotificationChannel(channelId);
+ if (channel != null) {
+ nm.deleteNotificationChannel(channelId);
+ }
+ }
+
+ private static Set<String> getAllExistingChannelIds(NotificationManagerCompat nm) {
+ Set<String> result = new ArraySet<>();
+ for (NotificationChannel channel : nm.getNotificationChannels()) {
+ result.add(channel.getId());
+ }
+ return result;
+ }
+
+ public static void updateNotificationChannels(Context context) {
+ if (!Utils.isOOrLater()) {
+ return;
+ }
+
+ NotificationManagerCompat nm = NotificationManagerCompat.from(context);
+
+ // These channels got a new behavior so we need to recreate them with new ids
+ deleteChannel(nm, "alarmLowPriorityNotification");
+ deleteChannel(nm, "alarmHighPriorityNotification");
+ deleteChannel(nm, "StopwatchNotification");
+ deleteChannel(nm, "alarmNotification");
+ deleteChannel(nm, "TimerModelNotification");
+ deleteChannel(nm, "firingAlarmsTimersNotification");
+ deleteChannel(nm, "alarmSnoozeNotification");
+
+ // We recreate all existing channels so any language change or our name changes propagate
+ // to the actual channels
+ Set<String> existingChannelIds = getAllExistingChannelIds(nm);
+ for (String id : existingChannelIds) {
+ createChannel(context, id);
+ }
+ }
+}
diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java
index 0c9daf6..348c795 100644
--- a/src/com/android/deskclock/Utils.java
+++ b/src/com/android/deskclock/Utils.java
@@ -157,6 +157,20 @@
}
/**
+ * @return {@code true} if the device is {@link Build.VERSION_CODES#O} or later
+ */
+ public static boolean isOOrLater() {
+ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
+ }
+
+ /**
+ * @return {@code true} if the device is {@link Build.VERSION_CODES#P} or later
+ */
+ public static boolean isPOrLater() {
+ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.P;
+ }
+
+ /**
* @param resourceId identifies an application resource
* @return the Uri by which the application resource is accessed
*/
diff --git a/src/com/android/deskclock/alarms/AlarmActivity.java b/src/com/android/deskclock/alarms/AlarmActivity.java
index 88632c7..d7d6c07 100644
--- a/src/com/android/deskclock/alarms/AlarmActivity.java
+++ b/src/com/android/deskclock/alarms/AlarmActivity.java
@@ -496,7 +496,7 @@
R.plurals.alarm_alert_snooze_set, snoozeMinutes, snoozeMinutes);
getAlertAnimator(mSnoozeButton, R.string.alarm_alert_snoozed_text, infoText,
- accessibilityText, colorAccent, colorAccent).start();
+ accessibilityText, Color.DKGRAY, mCurrentHourColor).start();
AlarmStateManager.setSnoozeState(this, mAlarmInstance, false /* showToast */);
@@ -517,7 +517,7 @@
getAlertAnimator(mDismissButton, R.string.alarm_alert_off_text, null /* infoText */,
getString(R.string.alarm_alert_off_text) /* accessibilityText */,
- Color.WHITE, mCurrentHourColor).start();
+ Color.DKGRAY, mCurrentHourColor).start();
AlarmStateManager.deleteInstanceAndUpdateParent(this, mAlarmInstance);
diff --git a/src/com/android/deskclock/alarms/AlarmNotifications.java b/src/com/android/deskclock/alarms/AlarmNotifications.java
index 3e2c7e3..4c3c8ae 100644
--- a/src/com/android/deskclock/alarms/AlarmNotifications.java
+++ b/src/com/android/deskclock/alarms/AlarmNotifications.java
@@ -15,8 +15,14 @@
*/
package com.android.deskclock.alarms;
+import static com.android.deskclock.NotificationUtils.ALARM_MISSED_NOTIFICATION_CHANNEL_ID;
+import static com.android.deskclock.NotificationUtils.ALARM_SNOOZE_NOTIFICATION_CHANNEL_ID;
+import static com.android.deskclock.NotificationUtils.ALARM_UPCOMING_NOTIFICATION_CHANNEL_ID;
+import static com.android.deskclock.NotificationUtils.FIRING_NOTIFICATION_CHANNEL_ID;
+
import android.annotation.TargetApi;
import android.app.Notification;
+import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.Service;
@@ -33,6 +39,7 @@
import com.android.deskclock.AlarmUtils;
import com.android.deskclock.DeskClock;
import com.android.deskclock.LogUtils;
+import com.android.deskclock.NotificationUtils;
import com.android.deskclock.R;
import com.android.deskclock.Utils;
import com.android.deskclock.provider.Alarm;
@@ -43,7 +50,7 @@
import java.util.Locale;
import java.util.Objects;
-final class AlarmNotifications {
+public final class AlarmNotifications {
static final String EXTRA_NOTIFICATION_ID = "extra_notification_id";
/**
@@ -82,35 +89,41 @@
*/
private static final int ALARM_FIRING_NOTIFICATION_ID = Integer.MAX_VALUE - 7;
- static synchronized void showLowPriorityNotification(Context context,
- AlarmInstance instance) {
- LogUtils.v("Displaying low priority notification for alarm instance: " + instance.mId);
+ static synchronized void showUpcomingNotification(Context context,
+ AlarmInstance instance, boolean lowPriority) {
+ LogUtils.v("Displaying upcoming alarm notification for alarm instance: " + instance.mId +
+ "low priority: " + lowPriority);
- NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
- .setShowWhen(false)
- .setContentTitle(context.getString(
- R.string.alarm_alert_predismiss_title))
- .setContentText(AlarmUtils.getAlarmText(context, instance, true /* includeLabel */))
- .setColor(ContextCompat.getColor(context, R.color.default_background))
- .setSmallIcon(R.drawable.stat_notify_alarm)
- .setAutoCancel(false)
- .setSortKey(createSortKey(instance))
- .setPriority(NotificationCompat.PRIORITY_DEFAULT)
- .setCategory(NotificationCompat.CATEGORY_ALARM)
- .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
- .setLocalOnly(true);
+ NotificationCompat.Builder builder = new NotificationCompat.Builder(
+ context, ALARM_UPCOMING_NOTIFICATION_CHANNEL_ID)
+ .setShowWhen(false)
+ .setContentTitle(context.getString(
+ R.string.alarm_alert_predismiss_title))
+ .setContentText(AlarmUtils.getAlarmText(
+ context, instance, true /* includeLabel */))
+ .setColor(ContextCompat.getColor(context, R.color.default_background))
+ .setSmallIcon(R.drawable.stat_notify_alarm)
+ .setAutoCancel(false)
+ .setSortKey(createSortKey(instance))
+ .setPriority(NotificationCompat.PRIORITY_LOW)
+ .setCategory(NotificationCompat.CATEGORY_EVENT)
+ .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+ .setLocalOnly(true);
if (Utils.isNOrLater()) {
builder.setGroup(UPCOMING_GROUP_KEY);
}
- // Setup up hide notification
- Intent hideIntent = AlarmStateManager.createStateChangeIntent(context,
- AlarmStateManager.ALARM_DELETE_TAG, instance,
- AlarmInstance.HIDE_NOTIFICATION_STATE);
final int id = instance.hashCode();
- builder.setDeleteIntent(PendingIntent.getService(context, id,
- hideIntent, PendingIntent.FLAG_UPDATE_CURRENT));
+ if (lowPriority) {
+ // Setup up hide notification
+ Intent hideIntent = AlarmStateManager.createStateChangeIntent(context,
+ AlarmStateManager.ALARM_DELETE_TAG, instance,
+ AlarmInstance.HIDE_NOTIFICATION_STATE);
+
+ builder.setDeleteIntent(PendingIntent.getService(context, id,
+ hideIntent, PendingIntent.FLAG_UPDATE_CURRENT));
+ }
// Setup up dismiss action
Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context,
@@ -126,47 +139,7 @@
viewAlarmIntent, PendingIntent.FLAG_UPDATE_CURRENT));
NotificationManagerCompat nm = NotificationManagerCompat.from(context);
- final Notification notification = builder.build();
- nm.notify(id, notification);
- updateUpcomingAlarmGroupNotification(context, -1, notification);
- }
-
- static synchronized void showHighPriorityNotification(Context context,
- AlarmInstance instance) {
- LogUtils.v("Displaying high priority notification for alarm instance: " + instance.mId);
-
- NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
- .setShowWhen(false)
- .setContentTitle(context.getString(R.string.alarm_alert_predismiss_title))
- .setContentText(AlarmUtils.getAlarmText(context, instance, true /* includeLabel */))
- .setColor(ContextCompat.getColor(context, R.color.default_background))
- .setSmallIcon(R.drawable.stat_notify_alarm)
- .setAutoCancel(false)
- .setSortKey(createSortKey(instance))
- .setPriority(NotificationCompat.PRIORITY_HIGH)
- .setCategory(NotificationCompat.CATEGORY_ALARM)
- .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
- .setLocalOnly(true);
-
- if (Utils.isNOrLater()) {
- builder.setGroup(UPCOMING_GROUP_KEY);
- }
-
- // Setup up dismiss action
- Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context,
- AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.PREDISMISSED_STATE);
- final int id = instance.hashCode();
- builder.addAction(R.drawable.ic_alarm_off_24dp,
- context.getString(R.string.alarm_alert_dismiss_text),
- PendingIntent.getService(context, id,
- dismissIntent, PendingIntent.FLAG_UPDATE_CURRENT));
-
- // Setup content action if instance is owned by alarm
- Intent viewAlarmIntent = createViewAlarmIntent(context, instance);
- builder.setContentIntent(PendingIntent.getActivity(context, id,
- viewAlarmIntent, PendingIntent.FLAG_UPDATE_CURRENT));
-
- NotificationManagerCompat nm = NotificationManagerCompat.from(context);
+ NotificationUtils.createChannel(context, ALARM_UPCOMING_NOTIFICATION_CHANNEL_ID);
final Notification notification = builder.build();
nm.notify(id, notification);
updateUpcomingAlarmGroupNotification(context, -1, notification);
@@ -232,7 +205,6 @@
}
final NotificationManagerCompat nm = NotificationManagerCompat.from(context);
-
final Notification firstUpcoming = getFirstActiveNotification(context, UPCOMING_GROUP_KEY,
canceledNotificationId, postedNotification);
if (firstUpcoming == null) {
@@ -243,15 +215,17 @@
Notification summary = getActiveGroupSummaryNotification(context, UPCOMING_GROUP_KEY);
if (summary == null
|| !Objects.equals(summary.contentIntent, firstUpcoming.contentIntent)) {
- summary = new NotificationCompat.Builder(context)
+ NotificationUtils.createChannel(context, ALARM_UPCOMING_NOTIFICATION_CHANNEL_ID);
+ summary = new NotificationCompat.Builder(context,
+ ALARM_UPCOMING_NOTIFICATION_CHANNEL_ID)
.setShowWhen(false)
.setContentIntent(firstUpcoming.contentIntent)
.setColor(ContextCompat.getColor(context, R.color.default_background))
.setSmallIcon(R.drawable.stat_notify_alarm)
.setGroup(UPCOMING_GROUP_KEY)
.setGroupSummary(true)
- .setPriority(NotificationCompat.PRIORITY_HIGH)
- .setCategory(NotificationCompat.CATEGORY_ALARM)
+ .setPriority(NotificationCompat.PRIORITY_LOW)
+ .setCategory(NotificationCompat.CATEGORY_EVENT)
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setLocalOnly(true)
.build();
@@ -266,7 +240,6 @@
}
final NotificationManagerCompat nm = NotificationManagerCompat.from(context);
-
final Notification firstMissed = getFirstActiveNotification(context, MISSED_GROUP_KEY,
canceledNotificationId, postedNotification);
if (firstMissed == null) {
@@ -277,7 +250,8 @@
Notification summary = getActiveGroupSummaryNotification(context, MISSED_GROUP_KEY);
if (summary == null
|| !Objects.equals(summary.contentIntent, firstMissed.contentIntent)) {
- summary = new NotificationCompat.Builder(context)
+ NotificationUtils.createChannel(context, ALARM_MISSED_NOTIFICATION_CHANNEL_ID);
+ summary = new NotificationCompat.Builder(context, ALARM_MISSED_NOTIFICATION_CHANNEL_ID)
.setShowWhen(false)
.setContentIntent(firstMissed.contentIntent)
.setColor(ContextCompat.getColor(context, R.color.default_background))
@@ -285,7 +259,7 @@
.setGroup(MISSED_GROUP_KEY)
.setGroupSummary(true)
.setPriority(NotificationCompat.PRIORITY_HIGH)
- .setCategory(NotificationCompat.CATEGORY_ALARM)
+ .setCategory(NotificationCompat.CATEGORY_EVENT)
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setLocalOnly(true)
.build();
@@ -297,19 +271,20 @@
AlarmInstance instance) {
LogUtils.v("Displaying snoozed notification for alarm instance: " + instance.mId);
- NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
- .setShowWhen(false)
- .setContentTitle(instance.getLabelOrDefault(context))
- .setContentText(context.getString(R.string.alarm_alert_snooze_until,
- AlarmUtils.getFormattedTime(context, instance.getAlarmTime())))
- .setColor(ContextCompat.getColor(context, R.color.default_background))
- .setSmallIcon(R.drawable.stat_notify_alarm)
- .setAutoCancel(false)
- .setSortKey(createSortKey(instance))
- .setPriority(NotificationCompat.PRIORITY_MAX)
- .setCategory(NotificationCompat.CATEGORY_ALARM)
- .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
- .setLocalOnly(true);
+ NotificationCompat.Builder builder = new NotificationCompat.Builder(
+ context, ALARM_SNOOZE_NOTIFICATION_CHANNEL_ID)
+ .setShowWhen(false)
+ .setContentTitle(instance.getLabelOrDefault(context))
+ .setContentText(context.getString(R.string.alarm_alert_snooze_until,
+ AlarmUtils.getFormattedTime(context, instance.getAlarmTime())))
+ .setColor(ContextCompat.getColor(context, R.color.default_background))
+ .setSmallIcon(R.drawable.stat_notify_alarm)
+ .setAutoCancel(false)
+ .setSortKey(createSortKey(instance))
+ .setPriority(NotificationCompat.PRIORITY_LOW)
+ .setCategory(NotificationCompat.CATEGORY_EVENT)
+ .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+ .setLocalOnly(true);
if (Utils.isNOrLater()) {
builder.setGroup(UPCOMING_GROUP_KEY);
@@ -330,6 +305,7 @@
viewAlarmIntent, PendingIntent.FLAG_UPDATE_CURRENT));
NotificationManagerCompat nm = NotificationManagerCompat.from(context);
+ NotificationUtils.createChannel(context, ALARM_SNOOZE_NOTIFICATION_CHANNEL_ID);
final Notification notification = builder.build();
nm.notify(id, notification);
updateUpcomingAlarmGroupNotification(context, -1, notification);
@@ -341,18 +317,19 @@
String label = instance.mLabel;
String alarmTime = AlarmUtils.getFormattedTime(context, instance.getAlarmTime());
- NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
- .setShowWhen(false)
- .setContentTitle(context.getString(R.string.alarm_missed_title))
- .setContentText(instance.mLabel.isEmpty() ? alarmTime :
- context.getString(R.string.alarm_missed_text, alarmTime, label))
- .setColor(ContextCompat.getColor(context, R.color.default_background))
- .setSortKey(createSortKey(instance))
- .setSmallIcon(R.drawable.stat_notify_alarm)
- .setPriority(NotificationCompat.PRIORITY_HIGH)
- .setCategory(NotificationCompat.CATEGORY_ALARM)
- .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
- .setLocalOnly(true);
+ NotificationCompat.Builder builder = new NotificationCompat.Builder(
+ context, ALARM_MISSED_NOTIFICATION_CHANNEL_ID)
+ .setShowWhen(false)
+ .setContentTitle(context.getString(R.string.alarm_missed_title))
+ .setContentText(instance.mLabel.isEmpty() ? alarmTime :
+ context.getString(R.string.alarm_missed_text, alarmTime, label))
+ .setColor(ContextCompat.getColor(context, R.color.default_background))
+ .setSortKey(createSortKey(instance))
+ .setSmallIcon(R.drawable.stat_notify_alarm)
+ .setPriority(NotificationCompat.PRIORITY_HIGH)
+ .setCategory(NotificationCompat.CATEGORY_EVENT)
+ .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+ .setLocalOnly(true);
if (Utils.isNOrLater()) {
builder.setGroup(MISSED_GROUP_KEY);
@@ -375,6 +352,7 @@
showAndDismiss, PendingIntent.FLAG_UPDATE_CURRENT));
NotificationManagerCompat nm = NotificationManagerCompat.from(context);
+ NotificationUtils.createChannel(context, ALARM_MISSED_NOTIFICATION_CHANNEL_ID);
final Notification notification = builder.build();
nm.notify(id, notification);
updateMissedAlarmGroupNotification(context, -1, notification);
@@ -384,18 +362,20 @@
LogUtils.v("Displaying alarm notification for alarm instance: " + instance.mId);
Resources resources = service.getResources();
- NotificationCompat.Builder notification = new NotificationCompat.Builder(service)
- .setContentTitle(instance.getLabelOrDefault(service))
- .setContentText(AlarmUtils.getFormattedTime(service, instance.getAlarmTime()))
- .setColor(ContextCompat.getColor(service, R.color.default_background))
- .setSmallIcon(R.drawable.stat_notify_alarm)
- .setOngoing(true)
- .setAutoCancel(false)
- .setDefaults(NotificationCompat.DEFAULT_LIGHTS)
- .setWhen(0)
- .setCategory(NotificationCompat.CATEGORY_ALARM)
- .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
- .setLocalOnly(true);
+ NotificationCompat.Builder notification = new NotificationCompat.Builder(
+ service, FIRING_NOTIFICATION_CHANNEL_ID)
+ .setContentTitle(instance.getLabelOrDefault(service))
+ .setContentText(AlarmUtils.getFormattedTime(
+ service, instance.getAlarmTime()))
+ .setColor(ContextCompat.getColor(service, R.color.default_background))
+ .setSmallIcon(R.drawable.stat_notify_alarm)
+ .setOngoing(true)
+ .setAutoCancel(false)
+ .setDefaults(NotificationCompat.DEFAULT_LIGHTS)
+ .setWhen(0)
+ .setCategory(NotificationCompat.CATEGORY_ALARM)
+ .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+ .setLocalOnly(true);
// Setup Snooze Action
Intent snoozeIntent = AlarmStateManager.createStateChangeIntent(service,
@@ -432,13 +412,14 @@
notification.setFullScreenIntent(PendingIntent.getActivity(service,
ALARM_FIRING_NOTIFICATION_ID, fullScreenIntent, PendingIntent.FLAG_UPDATE_CURRENT),
true);
- notification.setPriority(NotificationCompat.PRIORITY_MAX);
+ notification.setPriority(NotificationCompat.PRIORITY_HIGH);
+ NotificationUtils.createChannel(service, FIRING_NOTIFICATION_CHANNEL_ID);
clearNotification(service, instance);
service.startForeground(ALARM_FIRING_NOTIFICATION_ID, notification.build());
}
- static synchronized void clearNotification(Context context, AlarmInstance instance) {
+ public static synchronized void clearNotification(Context context, AlarmInstance instance) {
LogUtils.v("Clearing notifications for alarm instance: " + instance.mId);
NotificationManagerCompat nm = NotificationManagerCompat.from(context);
final int id = instance.hashCode();
@@ -453,10 +434,10 @@
static void updateNotification(Context context, AlarmInstance instance) {
switch (instance.mAlarmState) {
case AlarmInstance.LOW_NOTIFICATION_STATE:
- showLowPriorityNotification(context, instance);
+ showUpcomingNotification(context, instance, true);
break;
case AlarmInstance.HIGH_NOTIFICATION_STATE:
- showHighPriorityNotification(context, instance);
+ showUpcomingNotification(context, instance, false);
break;
case AlarmInstance.SNOOZE_STATE:
showSnoozeNotification(context, instance);
diff --git a/src/com/android/deskclock/alarms/AlarmService.java b/src/com/android/deskclock/alarms/AlarmService.java
index b9a97db..83c2f57 100644
--- a/src/com/android/deskclock/alarms/AlarmService.java
+++ b/src/com/android/deskclock/alarms/AlarmService.java
@@ -21,6 +21,10 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
import android.os.Binder;
import android.os.IBinder;
import android.telephony.PhoneStateListener;
@@ -29,6 +33,7 @@
import com.android.deskclock.AlarmAlertWakeLock;
import com.android.deskclock.LogUtils;
import com.android.deskclock.R;
+import com.android.deskclock.data.DataModel;
import com.android.deskclock.events.Events;
import com.android.deskclock.provider.AlarmInstance;
@@ -62,6 +67,14 @@
/** Private action used to stop an alarm with this service. */
public static final String STOP_ALARM_ACTION = "STOP_ALARM";
+ // constants for no action/snooze/dismiss
+ private static final int ALARM_NO_ACTION = 0;
+ private static final int ALARM_SNOOZE = 1;
+ private static final int ALARM_DISMISS = 2;
+
+ // default action for flip and shake
+ private static final String DEFAULT_ACTION = Integer.toString(ALARM_NO_ACTION);
+
/** Binder given to AlarmActivity. */
private final IBinder mBinder = new Binder();
@@ -103,6 +116,9 @@
private TelephonyManager mTelephonyManager;
private AlarmInstance mCurrentAlarm = null;
+ private SensorManager mSensorManager;
+ private int mFlipAction;
+ private int mShakeAction;
private void startAlarm(AlarmInstance instance) {
LogUtils.v("AlarmService.start with instance: " + instance.mId);
@@ -118,6 +134,7 @@
mTelephonyManager.listen(mPhoneStateListener.init(), PhoneStateListener.LISTEN_CALL_STATE);
AlarmKlaxon.start(this, mCurrentAlarm);
sendBroadcast(new Intent(ALARM_ALERT_ACTION));
+ attachListeners();
}
private void stopCurrentAlarm() {
@@ -136,6 +153,7 @@
stopForeground(true /* removeNotification */);
mCurrentAlarm = null;
+ detachListeners();
AlarmAlertWakeLock.releaseCpuLock();
}
@@ -181,6 +199,11 @@
filter.addAction(ALARM_DISMISS_ACTION);
registerReceiver(mActionsReceiver, filter);
mIsRegistered = true;
+
+ // set up for flip and shake actions
+ mSensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
+ mFlipAction = DataModel.getDataModel().getFlipAction();
+ mShakeAction = DataModel.getDataModel().getShakeAction();
}
@Override
@@ -264,4 +287,161 @@
}
}
}
+
+ private interface ResettableSensorEventListener extends SensorEventListener {
+ public void reset();
+ }
+
+ private final ResettableSensorEventListener mFlipListener =
+ new ResettableSensorEventListener() {
+ // Accelerometers are not quite accurate.
+ private static final float GRAVITY_UPPER_THRESHOLD = 1.3f * SensorManager.STANDARD_GRAVITY;
+ private static final float GRAVITY_LOWER_THRESHOLD = 0.7f * SensorManager.STANDARD_GRAVITY;
+ private static final int SENSOR_SAMPLES = 3;
+
+ private boolean mStopped;
+ private boolean mWasFaceUp;
+ private boolean[] mSamples = new boolean[SENSOR_SAMPLES];
+ private int mSampleIndex;
+
+ @Override
+ public void onAccuracyChanged(Sensor sensor, int acc) {
+ }
+
+ @Override
+ public void reset() {
+ mWasFaceUp = false;
+ mStopped = false;
+ for (int i = 0; i < SENSOR_SAMPLES; i++) {
+ mSamples[i] = false;
+ }
+ }
+
+ private boolean filterSamples() {
+ boolean allPass = true;
+ for (boolean sample : mSamples) {
+ allPass = allPass && sample;
+ }
+ return allPass;
+ }
+
+ @Override
+ public void onSensorChanged(SensorEvent event) {
+ // Add a sample overwriting the oldest one. Several samples
+ // are used to avoid the erroneous values the sensor sometimes
+ // returns.
+ float z = event.values[2];
+
+ if (mStopped) {
+ return;
+ }
+
+ if (!mWasFaceUp) {
+ // Check if its face up enough.
+ mSamples[mSampleIndex] = (z > GRAVITY_LOWER_THRESHOLD) &&
+ (z < GRAVITY_UPPER_THRESHOLD);
+
+ // face up
+ if (filterSamples()) {
+ mWasFaceUp = true;
+ for (int i = 0; i < SENSOR_SAMPLES; i++) {
+ mSamples[i] = false;
+ }
+ }
+ } else {
+ // Check if its face down enough.
+ mSamples[mSampleIndex] = (z < -GRAVITY_LOWER_THRESHOLD) &&
+ (z > -GRAVITY_UPPER_THRESHOLD);
+
+ // face down
+ if (filterSamples()) {
+ mStopped = true;
+ handleAction(mFlipAction);
+ }
+ }
+
+ mSampleIndex = ((mSampleIndex + 1) % SENSOR_SAMPLES);
+ }
+ };
+
+ private final SensorEventListener mShakeListener = new SensorEventListener() {
+ private static final float SENSITIVITY = 16;
+ private static final int BUFFER = 5;
+ private float[] gravity = new float[3];
+ private float average = 0;
+ private int fill = 0;
+
+ @Override
+ public void onAccuracyChanged(Sensor sensor, int acc) {
+ }
+
+ public void onSensorChanged(SensorEvent event) {
+ final float alpha = 0.8F;
+
+ for (int i = 0; i < 3; i++) {
+ gravity[i] = alpha * gravity[i] + (1 - alpha) * event.values[i];
+ }
+
+ float x = event.values[0] - gravity[0];
+ float y = event.values[1] - gravity[1];
+ float z = event.values[2] - gravity[2];
+
+ if (fill <= BUFFER) {
+ average += Math.abs(x) + Math.abs(y) + Math.abs(z);
+ fill++;
+ } else {
+ if (average / BUFFER >= SENSITIVITY) {
+ handleAction(mShakeAction);
+ }
+ average = 0;
+ fill = 0;
+ }
+ }
+ };
+
+ private void attachListeners() {
+ if (mFlipAction != ALARM_NO_ACTION) {
+ mFlipListener.reset();
+ mSensorManager.registerListener(mFlipListener,
+ mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER),
+ SensorManager.SENSOR_DELAY_NORMAL,
+ 300 * 1000); //batch every 300 milliseconds
+ }
+
+ if (mShakeAction != ALARM_NO_ACTION) {
+ mSensorManager.registerListener(mShakeListener,
+ mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER),
+ SensorManager.SENSOR_DELAY_GAME,
+ 50 * 1000); //batch every 50 milliseconds
+ }
+ }
+
+ private void detachListeners() {
+ if (mFlipAction != ALARM_NO_ACTION) {
+ mSensorManager.unregisterListener(mFlipListener);
+ }
+ if (mShakeAction != ALARM_NO_ACTION) {
+ mSensorManager.unregisterListener(mShakeListener);
+ }
+ }
+
+ private void handleAction(int action) {
+ switch (action) {
+ case ALARM_SNOOZE:
+ // Setup Snooze Action
+ startService(AlarmStateManager.createStateChangeIntent(this,
+ AlarmStateManager.ALARM_SNOOZE_TAG, mCurrentAlarm,
+ AlarmInstance.SNOOZE_STATE));
+ break;
+ case ALARM_DISMISS:
+ // Setup Dismiss Action
+ startService(AlarmStateManager.createStateChangeIntent(this,
+ AlarmStateManager.ALARM_DISMISS_TAG, mCurrentAlarm,
+ AlarmInstance.DISMISSED_STATE));
+ break;
+ case ALARM_NO_ACTION:
+ default:
+ break;
+ }
+ }
}
diff --git a/src/com/android/deskclock/alarms/AlarmStateManager.java b/src/com/android/deskclock/alarms/AlarmStateManager.java
index 0f70a0f..4f91f84 100644
--- a/src/com/android/deskclock/alarms/AlarmStateManager.java
+++ b/src/com/android/deskclock/alarms/AlarmStateManager.java
@@ -143,6 +143,17 @@
private static StateChangeScheduler sStateChangeScheduler =
new AlarmManagerStateChangeScheduler();
+ private static final String ACTION_SET_POWEROFF_ALARM =
+ "org.codeaurora.poweroffalarm.action.SET_ALARM";
+
+ private static final String ACTION_CANCEL_POWEROFF_ALARM =
+ "org.codeaurora.poweroffalarm.action.CANCEL_ALARM";
+
+ private static final String POWER_OFF_ALARM_PACKAGE =
+ "com.qualcomm.qti.poweroffalarm";
+
+ private static final String TIME = "time";
+
private static Calendar getCurrentTime() {
return sCurrentTimeFactory == null
? DataModel.getDataModel().getCalendar()
@@ -167,6 +178,10 @@
private static void updateNextAlarm(Context context) {
final AlarmInstance nextAlarm = getNextFiringAlarm(context);
+ if (nextAlarm != null) {
+ setPowerOffAlarm(context, nextAlarm);
+ }
+
if (Utils.isPreL()) {
updateNextAlarmInSystemSettings(context, nextAlarm);
} else {
@@ -383,7 +398,7 @@
AlarmInstance.updateInstance(contentResolver, instance);
// Setup instance notification and scheduling timers
- AlarmNotifications.showLowPriorityNotification(context, instance);
+ AlarmNotifications.showUpcomingNotification(context, instance, true);
scheduleInstanceStateChange(context, instance.getHighNotificationTime(),
instance, AlarmInstance.HIGH_NOTIFICATION_STATE);
}
@@ -427,7 +442,7 @@
AlarmInstance.updateInstance(contentResolver, instance);
// Setup instance notification and scheduling timers
- AlarmNotifications.showHighPriorityNotification(context, instance);
+ AlarmNotifications.showUpcomingNotification(context, instance, false);
scheduleInstanceStateChange(context, instance.getAlarmTime(),
instance, AlarmInstance.FIRED_STATE);
}
@@ -543,6 +558,7 @@
scheduleInstanceStateChange(context, instance.getMissedTimeToLive(),
instance, AlarmInstance.DISMISSED_STATE);
+ cancelPowerOffAlarm(context, instance);
// Instance is not valid anymore, so find next alarm that will fire and notify system
updateNextAlarm(context);
}
@@ -572,6 +588,7 @@
updateParentAlarm(context, instance);
}
+ cancelPowerOffAlarm(context, instance);
updateNextAlarm(context);
}
@@ -583,6 +600,8 @@
instance.mAlarmState = AlarmInstance.DISMISSED_STATE;
final ContentResolver contentResolver = context.getContentResolver();
AlarmInstance.updateInstance(contentResolver, instance);
+
+ cancelPowerOffAlarm(context, instance);
}
/**
@@ -992,6 +1011,23 @@
void cancelScheduledInstanceStateChange(Context context, AlarmInstance instance);
}
+ private static void setPowerOffAlarm(Context context, AlarmInstance instance) {
+ LogUtils.i("Set next power off alarm : instance id "+ instance.mId);
+ Intent intent = new Intent(ACTION_SET_POWEROFF_ALARM);
+ intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+ intent.setPackage(POWER_OFF_ALARM_PACKAGE);
+ intent.putExtra(TIME, instance.getAlarmTime().getTimeInMillis());
+ context.sendBroadcast(intent);
+ }
+
+ private static void cancelPowerOffAlarm(Context context, AlarmInstance instance) {
+ Intent intent = new Intent(ACTION_CANCEL_POWEROFF_ALARM);
+ intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+ intent.putExtra(TIME, instance.getAlarmTime().getTimeInMillis());
+ intent.setPackage(POWER_OFF_ALARM_PACKAGE);
+ context.sendBroadcast(intent);
+ }
+
/**
* Schedules state change callbacks within the AlarmManager.
*/
diff --git a/src/com/android/deskclock/alarms/AlarmTimeClickHandler.java b/src/com/android/deskclock/alarms/AlarmTimeClickHandler.java
index 6c94649..c22bbce 100644
--- a/src/com/android/deskclock/alarms/AlarmTimeClickHandler.java
+++ b/src/com/android/deskclock/alarms/AlarmTimeClickHandler.java
@@ -16,11 +16,11 @@
package com.android.deskclock.alarms;
-import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.Vibrator;
+import androidx.fragment.app.Fragment;
import com.android.deskclock.AlarmClockFragment;
import com.android.deskclock.LabelDialogFragment;
diff --git a/src/com/android/deskclock/alarms/TimePickerDialogFragment.java b/src/com/android/deskclock/alarms/TimePickerDialogFragment.java
index 33fc757..653b516 100644
--- a/src/com/android/deskclock/alarms/TimePickerDialogFragment.java
+++ b/src/com/android/deskclock/alarms/TimePickerDialogFragment.java
@@ -17,9 +17,6 @@
package com.android.deskclock.alarms;
import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.Fragment;
-import android.app.FragmentManager;
import android.app.TimePickerDialog;
import android.content.Context;
import android.content.DialogInterface;
@@ -27,6 +24,9 @@
import androidx.appcompat.app.AlertDialog;
import android.text.format.DateFormat;
import android.widget.TimePicker;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
import com.android.deskclock.Utils;
diff --git a/src/com/android/deskclock/alarms/dataadapter/AlarmItemViewHolder.java b/src/com/android/deskclock/alarms/dataadapter/AlarmItemViewHolder.java
index d9c4986..a39ad61 100644
--- a/src/com/android/deskclock/alarms/dataadapter/AlarmItemViewHolder.java
+++ b/src/com/android/deskclock/alarms/dataadapter/AlarmItemViewHolder.java
@@ -36,8 +36,8 @@
public abstract class AlarmItemViewHolder extends ItemAdapter.ItemViewHolder<AlarmItemHolder>
implements ItemAnimator.OnAnimateChangeListener {
- private static final float CLOCK_ENABLED_ALPHA = 1f;
- private static final float CLOCK_DISABLED_ALPHA = 0.69f;
+ public static final float CLOCK_ENABLED_ALPHA = 1f;
+ public static final float CLOCK_DISABLED_ALPHA = 0.69f;
public static final float ANIM_STANDARD_DELAY_MULTIPLIER = 1f / 6f;
public static final float ANIM_LONG_DURATION_MULTIPLIER = 2f / 3f;
diff --git a/src/com/android/deskclock/alarms/dataadapter/CollapsedAlarmViewHolder.java b/src/com/android/deskclock/alarms/dataadapter/CollapsedAlarmViewHolder.java
index 70ed1bb..4c04076 100644
--- a/src/com/android/deskclock/alarms/dataadapter/CollapsedAlarmViewHolder.java
+++ b/src/com/android/deskclock/alarms/dataadapter/CollapsedAlarmViewHolder.java
@@ -52,6 +52,8 @@
private final TextView upcomingInstanceLabel;
private final View hairLine;
+ private float annotationsAlpha = CLOCK_ENABLED_ALPHA;
+
private CollapsedAlarmViewHolder(View itemView) {
super(itemView);
@@ -105,6 +107,7 @@
bindReadOnlyLabel(context, alarm);
bindUpcomingInstance(context, alarm);
bindPreemptiveDismissButton(context, alarm, alarmInstance);
+ bindAnnotations(context, alarm);
}
private void bindReadOnlyLabel(Context context, Alarm alarm) {
@@ -145,6 +148,11 @@
}
}
+ private void bindAnnotations(Context context, Alarm alarm) {
+ annotationsAlpha = alarm.enabled ? CLOCK_ENABLED_ALPHA : CLOCK_DISABLED_ALPHA;
+ setChangingViewsAlpha(annotationsAlpha);
+ }
+
@Override
public Animator onAnimateChange(List<Object> payloads, int fromLeft, int fromTop, int fromRight,
int fromBottom, long duration) {
@@ -161,7 +169,7 @@
}
final boolean isCollapsing = this == newHolder;
- setChangingViewsAlpha(isCollapsing ? 0f : 1f);
+ setChangingViewsAlpha(isCollapsing ? 0f : annotationsAlpha);
final Animator changeAnimatorSet = isCollapsing
? createCollapsingAnimator((AlarmItemViewHolder) oldHolder, duration)
@@ -173,7 +181,7 @@
onOff.setVisibility(View.VISIBLE);
arrow.setVisibility(View.VISIBLE);
arrow.setTranslationY(0f);
- setChangingViewsAlpha(1f);
+ setChangingViewsAlpha(annotationsAlpha);
arrow.jumpDrawablesToCurrentState();
}
});
@@ -208,11 +216,11 @@
private Animator createCollapsingAnimator(AlarmItemViewHolder oldHolder, long duration) {
final AnimatorSet alphaAnimatorSet = new AnimatorSet();
alphaAnimatorSet.playTogether(
- ObjectAnimator.ofFloat(alarmLabel, View.ALPHA, 1f),
- ObjectAnimator.ofFloat(daysOfWeek, View.ALPHA, 1f),
- ObjectAnimator.ofFloat(upcomingInstanceLabel, View.ALPHA, 1f),
- ObjectAnimator.ofFloat(preemptiveDismissButton, View.ALPHA, 1f),
- ObjectAnimator.ofFloat(hairLine, View.ALPHA, 1f));
+ ObjectAnimator.ofFloat(alarmLabel, View.ALPHA, annotationsAlpha),
+ ObjectAnimator.ofFloat(daysOfWeek, View.ALPHA, annotationsAlpha),
+ ObjectAnimator.ofFloat(upcomingInstanceLabel, View.ALPHA, annotationsAlpha),
+ ObjectAnimator.ofFloat(preemptiveDismissButton, View.ALPHA, annotationsAlpha),
+ ObjectAnimator.ofFloat(hairLine, View.ALPHA, annotationsAlpha));
final long standardDelay = (long) (duration * ANIM_STANDARD_DELAY_MULTIPLIER);
alphaAnimatorSet.setDuration(standardDelay);
alphaAnimatorSet.setStartDelay(duration - standardDelay);
diff --git a/src/com/android/deskclock/data/AlarmModel.java b/src/com/android/deskclock/data/AlarmModel.java
index da50fe5..cc1a42e 100644
--- a/src/com/android/deskclock/data/AlarmModel.java
+++ b/src/com/android/deskclock/data/AlarmModel.java
@@ -78,6 +78,14 @@
return mSettingsModel.getSnoozeLength();
}
+ int getFlipAction() {
+ return mSettingsModel.getFlipAction();
+ }
+
+ int getShakeAction() {
+ return mSettingsModel.getShakeAction();
+ }
+
/**
* This receiver is notified when system settings change. Cached information built on
* those system settings must be cleared.
diff --git a/src/com/android/deskclock/data/DataModel.java b/src/com/android/deskclock/data/DataModel.java
index 1b43232..ec49b8d 100644
--- a/src/com/android/deskclock/data/DataModel.java
+++ b/src/com/android/deskclock/data/DataModel.java
@@ -735,6 +735,14 @@
return mAlarmModel.getSnoozeLength();
}
+ public int getFlipAction() {
+ return mAlarmModel.getFlipAction();
+ }
+
+ public int getShakeAction() {
+ return mAlarmModel.getShakeAction();
+ }
+
//
// Stopwatch
//
diff --git a/src/com/android/deskclock/data/SettingsDAO.java b/src/com/android/deskclock/data/SettingsDAO.java
index 78e8e1a..722c968 100644
--- a/src/com/android/deskclock/data/SettingsDAO.java
+++ b/src/com/android/deskclock/data/SettingsDAO.java
@@ -349,6 +349,16 @@
return new TimeZones(tzIds, tzNames);
}
+ static int getFlipAction(SharedPreferences prefs) {
+ final String string = prefs.getString(SettingsActivity.KEY_FLIP_ACTION, "0");
+ return Integer.parseInt(string);
+ }
+
+ static int getShakeAction(SharedPreferences prefs) {
+ final String string = prefs.getString(SettingsActivity.KEY_SHAKE_ACTION, "0");
+ return Integer.parseInt(string);
+ }
+
private static ClockStyle getClockStyle(Context context, SharedPreferences prefs, String key) {
final String defaultStyle = context.getString(R.string.default_clock_style);
final String clockStyle = prefs.getString(key, defaultStyle);
diff --git a/src/com/android/deskclock/data/SettingsModel.java b/src/com/android/deskclock/data/SettingsModel.java
index 103c210..e41a893 100644
--- a/src/com/android/deskclock/data/SettingsModel.java
+++ b/src/com/android/deskclock/data/SettingsModel.java
@@ -133,6 +133,14 @@
return SettingsDAO.getSnoozeLength(mPrefs);
}
+ int getFlipAction() {
+ return SettingsDAO.getFlipAction(mPrefs);
+ }
+
+ int getShakeAction() {
+ return SettingsDAO.getShakeAction(mPrefs);
+ }
+
Uri getDefaultAlarmRingtoneUri() {
return SettingsDAO.getDefaultAlarmRingtoneUri(mPrefs);
}
diff --git a/src/com/android/deskclock/data/StopwatchModel.java b/src/com/android/deskclock/data/StopwatchModel.java
index 3d4bc60..764f223 100644
--- a/src/com/android/deskclock/data/StopwatchModel.java
+++ b/src/com/android/deskclock/data/StopwatchModel.java
@@ -17,6 +17,7 @@
package com.android.deskclock.data;
import android.app.Notification;
+import android.app.NotificationChannel;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -25,6 +26,8 @@
import androidx.annotation.VisibleForTesting;
import androidx.core.app.NotificationManagerCompat;
+import com.android.deskclock.R;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -252,4 +255,4 @@
updateNotification();
}
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/deskclock/data/StopwatchNotificationBuilder.java b/src/com/android/deskclock/data/StopwatchNotificationBuilder.java
index 4ca8c7b..71405f1 100644
--- a/src/com/android/deskclock/data/StopwatchNotificationBuilder.java
+++ b/src/com/android/deskclock/data/StopwatchNotificationBuilder.java
@@ -16,7 +16,10 @@
package com.android.deskclock.data;
+import static com.android.deskclock.NotificationUtils.STOPWATCH_NOTIFICATION_CHANNEL_ID;
+
import android.app.Notification;
+import android.app.NotificationChannel;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
@@ -27,9 +30,11 @@
import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationCompat.Action;
import androidx.core.app.NotificationCompat.Builder;
+import androidx.core.app.NotificationManagerCompat;
import androidx.core.content.ContextCompat;
import android.widget.RemoteViews;
+import com.android.deskclock.NotificationUtils;
import com.android.deskclock.R;
import com.android.deskclock.Utils;
import com.android.deskclock.events.Events;
@@ -127,16 +132,17 @@
content.setViewVisibility(R.id.state, VISIBLE);
}
- final Builder notification = new NotificationCompat.Builder(context)
- .setLocalOnly(true)
- .setOngoing(running)
- .setCustomContentView(content)
- .setContentIntent(pendingShowApp)
- .setAutoCancel(stopwatch.isPaused())
- .setPriority(Notification.PRIORITY_MAX)
- .setSmallIcon(R.drawable.stat_notify_stopwatch)
- .setStyle(new NotificationCompat.DecoratedCustomViewStyle())
- .setColor(ContextCompat.getColor(context, R.color.default_background));
+ final Builder notification = new NotificationCompat.Builder(
+ context, STOPWATCH_NOTIFICATION_CHANNEL_ID)
+ .setLocalOnly(true)
+ .setOngoing(running)
+ .setCustomContentView(content)
+ .setContentIntent(pendingShowApp)
+ .setAutoCancel(stopwatch.isPaused())
+ .setPriority(Notification.PRIORITY_LOW)
+ .setSmallIcon(R.drawable.stat_notify_stopwatch)
+ .setStyle(new NotificationCompat.DecoratedCustomViewStyle())
+ .setColor(ContextCompat.getColor(context, R.color.default_background));
if (Utils.isNOrLater()) {
notification.setGroup(nm.getStopwatchNotificationGroupKey());
@@ -146,6 +152,7 @@
notification.addAction(action);
}
+ NotificationUtils.createChannel(context, STOPWATCH_NOTIFICATION_CHANNEL_ID);
return notification.build();
}
}
diff --git a/src/com/android/deskclock/data/TimerModel.java b/src/com/android/deskclock/data/TimerModel.java
index d24a5a6..33f02c5 100644
--- a/src/com/android/deskclock/data/TimerModel.java
+++ b/src/com/android/deskclock/data/TimerModel.java
@@ -19,6 +19,7 @@
import android.annotation.SuppressLint;
import android.app.AlarmManager;
import android.app.Notification;
+import android.app.NotificationChannel;
import android.app.PendingIntent;
import android.app.Service;
import android.content.BroadcastReceiver;
@@ -753,7 +754,6 @@
mNotificationBuilder.build(mContext, mNotificationModel, unexpired);
final int notificationId = mNotificationModel.getUnexpiredTimerNotificationId();
mNotificationManager.notify(notificationId, notification);
-
}
/**
diff --git a/src/com/android/deskclock/data/TimerNotificationBuilder.java b/src/com/android/deskclock/data/TimerNotificationBuilder.java
index 4d93053..59727ab 100644
--- a/src/com/android/deskclock/data/TimerNotificationBuilder.java
+++ b/src/com/android/deskclock/data/TimerNotificationBuilder.java
@@ -16,9 +16,13 @@
package com.android.deskclock.data;
+import static com.android.deskclock.NotificationUtils.FIRING_NOTIFICATION_CHANNEL_ID;
+import static com.android.deskclock.NotificationUtils.TIMER_MODEL_NOTIFICATION_CHANNEL_ID;
+
import android.annotation.TargetApi;
import android.app.AlarmManager;
import android.app.Notification;
+import android.app.NotificationChannel;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
@@ -27,11 +31,13 @@
import android.os.SystemClock;
import androidx.annotation.DrawableRes;
import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
import androidx.core.content.ContextCompat;
import android.text.TextUtils;
import android.widget.RemoteViews;
import com.android.deskclock.AlarmUtils;
+import com.android.deskclock.NotificationUtils;
import com.android.deskclock.R;
import com.android.deskclock.Utils;
import com.android.deskclock.events.Events;
@@ -148,19 +154,20 @@
PendingIntent.getService(context, REQUEST_CODE_UPCOMING, showApp,
PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);
- final Builder notification = new NotificationCompat.Builder(context)
- .setOngoing(true)
- .setLocalOnly(true)
- .setShowWhen(false)
- .setAutoCancel(false)
- .setContentIntent(pendingShowApp)
- .setPriority(Notification.PRIORITY_HIGH)
- .setCategory(NotificationCompat.CATEGORY_ALARM)
- .setSmallIcon(R.drawable.stat_notify_timer)
- .setSortKey(nm.getTimerNotificationSortKey())
- .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
- .setStyle(new NotificationCompat.DecoratedCustomViewStyle())
- .setColor(ContextCompat.getColor(context, R.color.default_background));
+ final Builder notification = new NotificationCompat.Builder(
+ context, TIMER_MODEL_NOTIFICATION_CHANNEL_ID)
+ .setOngoing(true)
+ .setLocalOnly(true)
+ .setShowWhen(false)
+ .setAutoCancel(false)
+ .setContentIntent(pendingShowApp)
+ .setPriority(Notification.PRIORITY_LOW)
+ .setCategory(NotificationCompat.CATEGORY_ALARM)
+ .setSmallIcon(R.drawable.stat_notify_timer)
+ .setSortKey(nm.getTimerNotificationSortKey())
+ .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+ .setStyle(new NotificationCompat.DecoratedCustomViewStyle())
+ .setColor(ContextCompat.getColor(context, R.color.default_background));
for (Action action : actions) {
notification.addAction(action);
@@ -207,6 +214,7 @@
}
}
+ NotificationUtils.createChannel(context, TIMER_MODEL_NOTIFICATION_CHANNEL_ID);
return notification.build();
}
@@ -261,18 +269,19 @@
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NO_USER_ACTION);
final PendingIntent pendingFullScreen = Utils.pendingActivityIntent(context, fullScreen);
- final Builder notification = new NotificationCompat.Builder(context)
- .setOngoing(true)
- .setLocalOnly(true)
- .setShowWhen(false)
- .setAutoCancel(false)
- .setContentIntent(contentIntent)
- .setPriority(Notification.PRIORITY_MAX)
- .setDefaults(Notification.DEFAULT_LIGHTS)
- .setSmallIcon(R.drawable.stat_notify_timer)
- .setFullScreenIntent(pendingFullScreen, true)
- .setStyle(new NotificationCompat.DecoratedCustomViewStyle())
- .setColor(ContextCompat.getColor(context, R.color.default_background));
+ final Builder notification = new NotificationCompat.Builder(
+ context, FIRING_NOTIFICATION_CHANNEL_ID)
+ .setOngoing(true)
+ .setLocalOnly(true)
+ .setShowWhen(false)
+ .setAutoCancel(false)
+ .setContentIntent(contentIntent)
+ .setPriority(Notification.PRIORITY_HIGH)
+ .setDefaults(Notification.DEFAULT_LIGHTS)
+ .setSmallIcon(R.drawable.stat_notify_timer)
+ .setFullScreenIntent(pendingFullScreen, true)
+ .setStyle(new NotificationCompat.DecoratedCustomViewStyle())
+ .setColor(ContextCompat.getColor(context, R.color.default_background));
for (Action action : actions) {
notification.addAction(action);
@@ -288,6 +297,7 @@
notification.setContentTitle(stateText).setContentText(contentTextPreN);
}
+ NotificationUtils.createChannel(context, FIRING_NOTIFICATION_CHANNEL_ID);
return notification.build();
}
@@ -344,19 +354,20 @@
PendingIntent.getService(context, REQUEST_CODE_MISSING, showApp,
PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);
- final Builder notification = new NotificationCompat.Builder(context)
- .setLocalOnly(true)
- .setShowWhen(false)
- .setAutoCancel(false)
- .setContentIntent(pendingShowApp)
- .setPriority(Notification.PRIORITY_HIGH)
- .setCategory(NotificationCompat.CATEGORY_ALARM)
- .setSmallIcon(R.drawable.stat_notify_timer)
- .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
- .setSortKey(nm.getTimerNotificationMissedSortKey())
- .setStyle(new NotificationCompat.DecoratedCustomViewStyle())
- .addAction(action)
- .setColor(ContextCompat.getColor(context, R.color.default_background));
+ final Builder notification = new NotificationCompat.Builder(
+ context, TIMER_MODEL_NOTIFICATION_CHANNEL_ID)
+ .setLocalOnly(true)
+ .setShowWhen(false)
+ .setAutoCancel(false)
+ .setContentIntent(pendingShowApp)
+ .setPriority(Notification.PRIORITY_HIGH)
+ .setCategory(NotificationCompat.CATEGORY_ALARM)
+ .setSmallIcon(R.drawable.stat_notify_timer)
+ .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+ .setSortKey(nm.getTimerNotificationMissedSortKey())
+ .setStyle(new NotificationCompat.DecoratedCustomViewStyle())
+ .addAction(action)
+ .setColor(ContextCompat.getColor(context, R.color.default_background));
if (Utils.isNOrLater()) {
notification.setCustomContentView(buildChronometer(pname, base, true, stateText))
@@ -367,6 +378,7 @@
notification.setContentText(contentText).setContentTitle(stateText);
}
+ NotificationUtils.createChannel(context, TIMER_MODEL_NOTIFICATION_CHANNEL_ID);
return notification.build();
}
diff --git a/src/com/android/deskclock/provider/Alarm.java b/src/com/android/deskclock/provider/Alarm.java
index fc8aebd..c7f7e7e 100644
--- a/src/com/android/deskclock/provider/Alarm.java
+++ b/src/com/android/deskclock/provider/Alarm.java
@@ -20,13 +20,14 @@
import android.content.ContentUris;
import android.content.ContentValues;
import android.content.Context;
-import android.content.CursorLoader;
import android.content.Intent;
import android.database.Cursor;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
+import android.os.ParcelUuid;
+import androidx.loader.content.CursorLoader;
import com.android.deskclock.R;
import com.android.deskclock.data.DataModel;
@@ -35,6 +36,7 @@
import java.util.Calendar;
import java.util.LinkedList;
import java.util.List;
+import java.util.UUID;
public final class Alarm implements Parcelable, ClockContract.AlarmsColumns {
/**
@@ -59,7 +61,8 @@
VIBRATE,
LABEL,
RINGTONE,
- DELETE_AFTER_USE
+ DELETE_AFTER_USE,
+ INCREASING_VOLUME,
};
private static final String[] QUERY_ALARMS_WITH_INSTANCES_COLUMNS = {
@@ -72,6 +75,7 @@
ClockDatabaseHelper.ALARMS_TABLE_NAME + "." + LABEL,
ClockDatabaseHelper.ALARMS_TABLE_NAME + "." + RINGTONE,
ClockDatabaseHelper.ALARMS_TABLE_NAME + "." + DELETE_AFTER_USE,
+ ClockDatabaseHelper.ALARMS_TABLE_NAME + "." + INCREASING_VOLUME,
ClockDatabaseHelper.INSTANCES_TABLE_NAME + "."
+ ClockContract.InstancesColumns.ALARM_STATE,
ClockDatabaseHelper.INSTANCES_TABLE_NAME + "." + ClockContract.InstancesColumns._ID,
@@ -97,6 +101,8 @@
private static final int LABEL_INDEX = 6;
private static final int RINGTONE_INDEX = 7;
private static final int DELETE_AFTER_USE_INDEX = 8;
+ private static final int INCREASING_VOLUME_INDEX = 9;
+
private static final int INSTANCE_STATE_INDEX = 9;
public static final int INSTANCE_ID_INDEX = 10;
public static final int INSTANCE_YEAR_INDEX = 11;
@@ -107,7 +113,7 @@
public static final int INSTANCE_LABEL_INDEX = 16;
public static final int INSTANCE_VIBRATE_INDEX = 17;
- private static final int COLUMN_COUNT = DELETE_AFTER_USE_INDEX + 1;
+ private static final int COLUMN_COUNT = INCREASING_VOLUME_INDEX + 1;
private static final int ALARM_JOIN_INSTANCE_COLUMN_COUNT = INSTANCE_VIBRATE_INDEX + 1;
public static ContentValues createContentValues(Alarm alarm) {
@@ -123,6 +129,7 @@
values.put(VIBRATE, alarm.vibrate ? 1 : 0);
values.put(LABEL, alarm.label);
values.put(DELETE_AFTER_USE, alarm.deleteAfterUse);
+ values.put(INCREASING_VOLUME, alarm.increasingVolume ? 1 : 0);
if (alarm.alert == null) {
// We want to put null, so default alarm changes
values.putNull(RINGTONE);
@@ -284,6 +291,7 @@
public String label;
public Uri alert;
public boolean deleteAfterUse;
+ public boolean increasingVolume;
public int instanceState;
public int instanceId;
@@ -301,6 +309,7 @@
this.label = "";
this.alert = DataModel.getDataModel().getDefaultAlarmRingtoneUri();
this.deleteAfterUse = false;
+ this.increasingVolume = false;
}
public Alarm(Cursor c) {
@@ -312,6 +321,7 @@
vibrate = c.getInt(VIBRATE_INDEX) == 1;
label = c.getString(LABEL_INDEX);
deleteAfterUse = c.getInt(DELETE_AFTER_USE_INDEX) == 1;
+ increasingVolume = c.getInt(INCREASING_VOLUME_INDEX) == 1;
if (c.getColumnCount() == ALARM_JOIN_INSTANCE_COLUMN_COUNT) {
instanceState = c.getInt(INSTANCE_STATE_INDEX);
@@ -337,6 +347,7 @@
label = p.readString();
alert = p.readParcelable(null);
deleteAfterUse = p.readInt() == 1;
+ increasingVolume = p.readInt() == 1;
}
/**
@@ -371,6 +382,7 @@
p.writeString(label);
p.writeParcelable(alert, flags);
p.writeInt(deleteAfterUse ? 1 : 0);
+ p.writeInt(increasingVolume ? 1 : 0);
}
public int describeContents() {
@@ -383,6 +395,7 @@
result.mVibrate = vibrate;
result.mLabel = label;
result.mRingtone = alert;
+ result.mIncreasingVolume = increasingVolume;
return result;
}
@@ -463,6 +476,7 @@
", vibrate=" + vibrate +
", label='" + label + '\'' +
", deleteAfterUse=" + deleteAfterUse +
+ ", increasingVolume=" + increasingVolume +
'}';
}
}
diff --git a/src/com/android/deskclock/provider/AlarmInstance.java b/src/com/android/deskclock/provider/AlarmInstance.java
index 9fb7a7b..a7502b7 100644
--- a/src/com/android/deskclock/provider/AlarmInstance.java
+++ b/src/com/android/deskclock/provider/AlarmInstance.java
@@ -33,6 +33,7 @@
import java.util.Calendar;
import java.util.LinkedList;
import java.util.List;
+import java.util.UUID;
public final class AlarmInstance implements ClockContract.InstancesColumns {
/**
@@ -66,7 +67,8 @@
VIBRATE,
RINGTONE,
ALARM_ID,
- ALARM_STATE
+ ALARM_STATE,
+ INCREASING_VOLUME
};
/**
@@ -84,8 +86,9 @@
private static final int RINGTONE_INDEX = 8;
private static final int ALARM_ID_INDEX = 9;
private static final int ALARM_STATE_INDEX = 10;
+ private static final int INCREASING_VOLUME_INDEX = 11;
- private static final int COLUMN_COUNT = ALARM_STATE_INDEX + 1;
+ private static final int COLUMN_COUNT = INCREASING_VOLUME_INDEX + 1;
public static ContentValues createContentValues(AlarmInstance instance) {
ContentValues values = new ContentValues(COLUMN_COUNT);
@@ -109,6 +112,8 @@
}
values.put(ALARM_ID, instance.mAlarmId);
values.put(ALARM_STATE, instance.mAlarmState);
+ values.put(INCREASING_VOLUME, instance.mIncreasingVolume ? 1 : 0);
+
return values;
}
@@ -295,6 +300,7 @@
public Uri mRingtone;
public Long mAlarmId;
public int mAlarmState;
+ public boolean mIncreasingVolume;
public AlarmInstance(Calendar calendar, Long alarmId) {
this(calendar);
@@ -308,6 +314,7 @@
mVibrate = false;
mRingtone = null;
mAlarmState = SILENT_STATE;
+ mIncreasingVolume = false;
}
public AlarmInstance(AlarmInstance instance) {
@@ -322,6 +329,7 @@
this.mRingtone = instance.mRingtone;
this.mAlarmId = instance.mAlarmId;
this.mAlarmState = instance.mAlarmState;
+ this.mIncreasingVolume = instance.mIncreasingVolume;
}
public AlarmInstance(Cursor c, boolean joinedTable) {
@@ -356,6 +364,7 @@
mAlarmId = c.getLong(ALARM_ID_INDEX);
}
mAlarmState = c.getInt(ALARM_STATE_INDEX);
+ mIncreasingVolume = c.getInt(INCREASING_VOLUME_INDEX) == 1;
}
/**
@@ -471,6 +480,7 @@
", mRingtone=" + mRingtone +
", mAlarmId=" + mAlarmId +
", mAlarmState=" + mAlarmState +
+ ", mIncreasingVolume=" + mIncreasingVolume +
'}';
}
}
diff --git a/src/com/android/deskclock/provider/ClockContract.java b/src/com/android/deskclock/provider/ClockContract.java
index 5335ccc..487ed6f 100644
--- a/src/com/android/deskclock/provider/ClockContract.java
+++ b/src/com/android/deskclock/provider/ClockContract.java
@@ -84,6 +84,12 @@
* <p>Type: STRING</p>
*/
String RINGTONE = "ringtone";
+
+ /**
+ * True if alarm should start off quiet and slowly increase volume
+ * <P>Type: BOOLEAN</P>
+ */
+ public static final String INCREASING_VOLUME = "incvol";
}
/**
diff --git a/src/com/android/deskclock/provider/ClockDatabaseHelper.java b/src/com/android/deskclock/provider/ClockDatabaseHelper.java
index b6fc900..11bd43c 100644
--- a/src/com/android/deskclock/provider/ClockDatabaseHelper.java
+++ b/src/com/android/deskclock/provider/ClockDatabaseHelper.java
@@ -16,6 +16,7 @@
package com.android.deskclock.provider;
+import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
@@ -29,6 +30,7 @@
import com.android.deskclock.data.Weekdays;
import java.util.Calendar;
+import java.util.UUID;
/**
* Helper class for opening the database from multiple providers. Also provides
@@ -57,11 +59,26 @@
*/
private static final int VERSION_8 = 8;
+ /**
+ * Added increasing alarm volume mode
+ */
+ private static final int VERSION_9 = 10;
+
+ /**
+ * Added change profile
+ */
+ private static final int VERSION_10 = 11;
+
+ /**
+ * Removed change profile
+ */
+ private static final int VERSION_11 = 12;
+
// This creates a default alarm at 8:30 for every Mon,Tue,Wed,Thu,Fri
- private static final String DEFAULT_ALARM_1 = "(8, 30, 31, 0, 1, '', NULL, 0);";
+ private static final String DEFAULT_ALARM_1 = "(8, 30, 31, 0, 1, '', NULL, 0, 0);";
// This creates a default alarm at 9:30 for every Sat,Sun
- private static final String DEFAULT_ALARM_2 = "(9, 00, 96, 0, 1, '', NULL, 0);";
+ private static final String DEFAULT_ALARM_2 = "(9, 00, 96, 0, 1, '', NULL, 0, 0);";
// Database and table names
static final String DATABASE_NAME = "alarms.db";
@@ -70,8 +87,8 @@
static final String INSTANCES_TABLE_NAME = "alarm_instances";
private static final String SELECTED_CITIES_TABLE_NAME = "selected_cities";
- private static void createAlarmsTable(SQLiteDatabase db) {
- db.execSQL("CREATE TABLE " + ALARMS_TABLE_NAME + " (" +
+ private static void createAlarmsTable(SQLiteDatabase db, String alarmsTableName) {
+ db.execSQL("CREATE TABLE " + alarmsTableName + " (" +
ClockContract.AlarmsColumns._ID + " INTEGER PRIMARY KEY," +
ClockContract.AlarmsColumns.HOUR + " INTEGER NOT NULL, " +
ClockContract.AlarmsColumns.MINUTES + " INTEGER NOT NULL, " +
@@ -80,12 +97,13 @@
ClockContract.AlarmsColumns.VIBRATE + " INTEGER NOT NULL, " +
ClockContract.AlarmsColumns.LABEL + " TEXT NOT NULL, " +
ClockContract.AlarmsColumns.RINGTONE + " TEXT, " +
- ClockContract.AlarmsColumns.DELETE_AFTER_USE + " INTEGER NOT NULL DEFAULT 0);");
+ ClockContract.AlarmsColumns.DELETE_AFTER_USE + " INTEGER NOT NULL DEFAULT 0, " +
+ ClockContract.AlarmsColumns.INCREASING_VOLUME + " INTEGER NOT NULL DEFAULT 0);");
LogUtils.i("Alarms Table created");
}
- private static void createInstanceTable(SQLiteDatabase db) {
- db.execSQL("CREATE TABLE " + INSTANCES_TABLE_NAME + " (" +
+ private static void createInstanceTable(SQLiteDatabase db, String instanceTableName) {
+ db.execSQL("CREATE TABLE " + instanceTableName + " (" +
ClockContract.InstancesColumns._ID + " INTEGER PRIMARY KEY," +
ClockContract.InstancesColumns.YEAR + " INTEGER NOT NULL, " +
ClockContract.InstancesColumns.MONTH + " INTEGER NOT NULL, " +
@@ -98,19 +116,19 @@
ClockContract.InstancesColumns.ALARM_STATE + " INTEGER NOT NULL, " +
ClockContract.InstancesColumns.ALARM_ID + " INTEGER REFERENCES " +
ALARMS_TABLE_NAME + "(" + ClockContract.AlarmsColumns._ID + ") " +
- "ON UPDATE CASCADE ON DELETE CASCADE" +
- ");");
+ "ON UPDATE CASCADE ON DELETE CASCADE, " +
+ ClockContract.InstancesColumns.INCREASING_VOLUME + " INTEGER NOT NULL DEFAULT 0);");
LogUtils.i("Instance table created");
}
public ClockDatabaseHelper(Context context) {
- super(context, DATABASE_NAME, null, VERSION_8);
+ super(context, DATABASE_NAME, null, VERSION_11);
}
@Override
public void onCreate(SQLiteDatabase db) {
- createAlarmsTable(db);
- createInstanceTable(db);
+ createAlarmsTable(db, ALARMS_TABLE_NAME);
+ createInstanceTable(db, INSTANCES_TABLE_NAME);
// insert default alarms
LogUtils.i("Inserting default alarms");
@@ -123,7 +141,8 @@
ClockContract.AlarmsColumns.VIBRATE + cs +
ClockContract.AlarmsColumns.LABEL + cs +
ClockContract.AlarmsColumns.RINGTONE + cs +
- ClockContract.AlarmsColumns.DELETE_AFTER_USE + ") VALUES ";
+ ClockContract.AlarmsColumns.DELETE_AFTER_USE + cs +
+ ClockContract.AlarmsColumns.INCREASING_VOLUME + ") VALUES ";
db.execSQL(insertMe + DEFAULT_ALARM_1);
db.execSQL(insertMe + DEFAULT_ALARM_2);
}
@@ -142,8 +161,8 @@
db.execSQL("DROP TABLE IF EXISTS " + INSTANCES_TABLE_NAME + ";");
// Create new alarms table and copy over the data
- createAlarmsTable(db);
- createInstanceTable(db);
+ createAlarmsTable(db, ALARMS_TABLE_NAME);
+ createInstanceTable(db, INSTANCES_TABLE_NAME);
LogUtils.i("Copying old alarms to new table");
final String[] OLD_TABLE_COLUMNS = {
@@ -155,6 +174,7 @@
"vibrate",
"message",
"alert",
+ "incvol"
};
try (Cursor cursor = db.query(OLD_ALARMS_TABLE_NAME, OLD_TABLE_COLUMNS,
null, null, null, null, null)) {
@@ -176,6 +196,7 @@
alarm.alert =
TextUtils.isEmpty(alertString) ? null : Uri.parse(alertString);
}
+ alarm.increasingVolume = cursor.getInt(8) == 1;
// Save new version of alarm and create alarm instance for it
db.insert(ALARMS_TABLE_NAME, null, Alarm.createContentValues(alarm));
@@ -189,6 +210,67 @@
LogUtils.i("Dropping old alarm table");
db.execSQL("DROP TABLE IF EXISTS " + OLD_ALARMS_TABLE_NAME + ";");
+ return;
+ }
+
+ if (oldVersion < VERSION_9) {
+ db.execSQL("ALTER TABLE " + ALARMS_TABLE_NAME
+ + " ADD COLUMN " + ClockContract.AlarmsColumns.INCREASING_VOLUME
+ + " INTEGER NOT NULL DEFAULT 0;");
+ db.execSQL("ALTER TABLE " + INSTANCES_TABLE_NAME
+ + " ADD COLUMN " + ClockContract.InstancesColumns.INCREASING_VOLUME
+ + " INTEGER NOT NULL DEFAULT 0;");
+ }
+
+ if (oldVersion < VERSION_10) {
+ db.execSQL("ALTER TABLE " + ALARMS_TABLE_NAME
+ + " ADD COLUMN profile"
+ + " TEXT NOT NULL DEFAULT '';");
+ db.execSQL("ALTER TABLE " + INSTANCES_TABLE_NAME
+ + " ADD COLUMN profile"
+ + " TEXT NOT NULL DEFAULT '';");
+ }
+
+ if (oldVersion < VERSION_11) {
+ LogUtils.i("Copying alarms to temporary table");
+ final String TEMP_ALARMS_TABLE_NAME = ALARMS_TABLE_NAME + "_temp";
+ final String TEMP_INSTANCES_TABLE_NAME = INSTANCES_TABLE_NAME + "_temp";
+ createAlarmsTable(db, TEMP_ALARMS_TABLE_NAME);
+ createInstanceTable(db, TEMP_INSTANCES_TABLE_NAME);
+ final String[] OLD_TABLE_COLUMNS = {
+ ClockContract.AlarmsColumns._ID,
+ ClockContract.AlarmsColumns.HOUR,
+ ClockContract.AlarmsColumns.MINUTES,
+ ClockContract.AlarmsColumns.DAYS_OF_WEEK,
+ ClockContract.AlarmsColumns.ENABLED,
+ ClockContract.AlarmsColumns.VIBRATE,
+ ClockContract.AlarmsColumns.LABEL,
+ ClockContract.AlarmsColumns.RINGTONE,
+ ClockContract.AlarmsColumns.DELETE_AFTER_USE,
+ ClockContract.AlarmsColumns.INCREASING_VOLUME
+ };
+
+ try (Cursor cursor = db.query(ALARMS_TABLE_NAME, OLD_TABLE_COLUMNS,
+ null, null, null, null, null)) {
+ final Calendar currentTime = Calendar.getInstance();
+ while (cursor != null && cursor.moveToNext()) {
+ final Alarm alarm = new Alarm(cursor);
+ // Save new version of alarm and create alarm instance for it
+ db.insert(TEMP_ALARMS_TABLE_NAME, null,
+ Alarm.createContentValues(alarm));
+ if (alarm.enabled) {
+ AlarmInstance newInstance = alarm.createInstanceAfter(currentTime);
+ db.insert(TEMP_INSTANCES_TABLE_NAME, null,
+ AlarmInstance.createContentValues(newInstance));
+ }
+ }
+ }
+ db.execSQL("DROP TABLE IF EXISTS " + ALARMS_TABLE_NAME + ";");
+ db.execSQL("DROP TABLE IF EXISTS " + INSTANCES_TABLE_NAME + ";");
+ db.execSQL("ALTER TABLE " + TEMP_ALARMS_TABLE_NAME
+ + " RENAME TO " + ALARMS_TABLE_NAME + ";");
+ db.execSQL("ALTER TABLE " + TEMP_INSTANCES_TABLE_NAME
+ + " RENAME TO " + INSTANCES_TABLE_NAME + ";");
}
}
diff --git a/src/com/android/deskclock/provider/ClockProvider.java b/src/com/android/deskclock/provider/ClockProvider.java
index 83480f3..0e88824 100644
--- a/src/com/android/deskclock/provider/ClockProvider.java
+++ b/src/com/android/deskclock/provider/ClockProvider.java
@@ -75,6 +75,8 @@
ALARMS_TABLE_NAME + "." + AlarmsColumns.RINGTONE);
sAlarmsWithInstancesProjection.put(ALARMS_TABLE_NAME + "." + AlarmsColumns.DELETE_AFTER_USE,
ALARMS_TABLE_NAME + "." + AlarmsColumns.DELETE_AFTER_USE);
+ sAlarmsWithInstancesProjection.put(ALARMS_TABLE_NAME + "." + AlarmsColumns.INCREASING_VOLUME,
+ ALARMS_TABLE_NAME + "." + AlarmsColumns.INCREASING_VOLUME);
sAlarmsWithInstancesProjection.put(INSTANCES_TABLE_NAME + "."
+ InstancesColumns.ALARM_STATE,
INSTANCES_TABLE_NAME + "." + InstancesColumns.ALARM_STATE);
diff --git a/src/com/android/deskclock/ringtone/AddCustomRingtoneViewHolder.java b/src/com/android/deskclock/ringtone/AddCustomRingtoneViewHolder.java
index 5cc6fad..906ec60 100644
--- a/src/com/android/deskclock/ringtone/AddCustomRingtoneViewHolder.java
+++ b/src/com/android/deskclock/ringtone/AddCustomRingtoneViewHolder.java
@@ -45,7 +45,7 @@
nameView.setAlpha(0.63f);
final ImageView imageView = (ImageView) itemView.findViewById(R.id.ringtone_image);
- imageView.setImageResource(R.drawable.ic_add_white_24dp);
+ imageView.setImageResource(R.drawable.ic_add_24dp);
imageView.setAlpha(0.63f);
}
diff --git a/src/com/android/deskclock/ringtone/RingtoneViewHolder.java b/src/com/android/deskclock/ringtone/RingtoneViewHolder.java
index 3e0a0b8..2ce37bd 100644
--- a/src/com/android/deskclock/ringtone/RingtoneViewHolder.java
+++ b/src/com/android/deskclock/ringtone/RingtoneViewHolder.java
@@ -79,8 +79,6 @@
}
} else if (itemHolder.item == Utils.RINGTONE_SILENT) {
mImageView.setImageResource(R.drawable.ic_ringtone_silent);
- } else if (itemHolder.isPlaying()) {
- mImageView.setImageResource(R.drawable.ic_ringtone_active);
} else {
mImageView.setImageResource(R.drawable.ic_ringtone);
}
diff --git a/src/com/android/deskclock/settings/AlarmVolumePreference.java b/src/com/android/deskclock/settings/AlarmVolumePreference.java
index b1eb8ce..92edd9e 100644
--- a/src/com/android/deskclock/settings/AlarmVolumePreference.java
+++ b/src/com/android/deskclock/settings/AlarmVolumePreference.java
@@ -44,7 +44,6 @@
private static final long ALARM_PREVIEW_DURATION_MS = 2000;
private SeekBar mSeekbar;
- private ImageView mAlarmIcon;
private boolean mPreviewPlaying;
public AlarmVolumePreference(Context context, AttributeSet attrs) {
@@ -61,17 +60,23 @@
// Disable click feedback for this preference.
holder.itemView.setClickable(false);
- mSeekbar = (SeekBar) holder.findViewById(R.id.alarm_volume_slider);
- mSeekbar.setMax(audioManager.getStreamMaxVolume(STREAM_ALARM));
- mSeekbar.setProgress(audioManager.getStreamVolume(STREAM_ALARM));
- mAlarmIcon = (ImageView) holder.findViewById(R.id.alarm_icon);
+ // Minimum volume for alarm is not 0, calculate it.
+ int maxVolume = audioManager.getStreamMaxVolume(STREAM_ALARM) - getMinVolume(audioManager);
+ mSeekbar = (SeekBar) holder.findViewById(R.id.seekbar);
+ mSeekbar.setMax(maxVolume);
+ mSeekbar.setProgress(audioManager.getStreamVolume(STREAM_ALARM) -
+ getMinVolume(audioManager));
+ ((ImageView) holder.findViewById(android.R.id.icon))
+ .setImageResource(R.drawable.ic_alarm_small);
+
onSeekbarChanged();
final ContentObserver volumeObserver = new ContentObserver(mSeekbar.getHandler()) {
@Override
public void onChange(boolean selfChange) {
// Volume was changed elsewhere, update our slider.
- mSeekbar.setProgress(audioManager.getStreamVolume(STREAM_ALARM));
+ mSeekbar.setProgress(audioManager.getStreamVolume(STREAM_ALARM) -
+ getMinVolume(audioManager));
}
};
@@ -92,7 +97,8 @@
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
if (fromUser) {
- audioManager.setStreamVolume(STREAM_ALARM, progress, 0);
+ int newVolume = progress + getMinVolume(audioManager);
+ audioManager.setStreamVolume(STREAM_ALARM, newVolume, 0);
}
onSeekbarChanged();
}
@@ -103,8 +109,8 @@
@Override
public void onStopTrackingTouch(SeekBar seekBar) {
- if (!mPreviewPlaying && seekBar.getProgress() != 0) {
- // If we are not currently playing and progress is set to non-zero, start.
+ if (!mPreviewPlaying) {
+ // If we are not currently playing, start.
RingtonePreviewKlaxon.start(
context, DataModel.getDataModel().getDefaultAlarmRingtoneUri());
mPreviewPlaying = true;
@@ -122,8 +128,6 @@
private void onSeekbarChanged() {
mSeekbar.setEnabled(doesDoNotDisturbAllowAlarmPlayback());
- mAlarmIcon.setImageResource(mSeekbar.getProgress() == 0 ?
- R.drawable.ic_alarm_off_24dp : R.drawable.ic_alarm_small);
}
private boolean doesDoNotDisturbAllowAlarmPlayback() {
@@ -137,4 +141,8 @@
return notificationManager.getCurrentInterruptionFilter() !=
NotificationManager.INTERRUPTION_FILTER_NONE;
}
+
+ private int getMinVolume(AudioManager audioManager) {
+ return (Utils.isPOrLater()) ? audioManager.getStreamMinVolume(STREAM_ALARM) : 0;
+ }
}
\ No newline at end of file
diff --git a/src/com/android/deskclock/settings/SettingsActivity.java b/src/com/android/deskclock/settings/SettingsActivity.java
index dcb5707..740d459 100644
--- a/src/com/android/deskclock/settings/SettingsActivity.java
+++ b/src/com/android/deskclock/settings/SettingsActivity.java
@@ -18,6 +18,8 @@
import android.content.Context;
import android.content.Intent;
+import android.hardware.Sensor;
+import android.hardware.SensorManager;
import android.os.Bundle;
import android.os.Vibrator;
import android.provider.Settings;
@@ -43,6 +45,8 @@
import com.android.deskclock.data.Weekdays;
import com.android.deskclock.ringtone.RingtonePickerActivity;
+import java.util.List;
+
/**
* Settings for the Alarm Clock.
*/
@@ -61,6 +65,8 @@
public static final String KEY_DATE_TIME = "date_time";
public static final String KEY_VOLUME_BUTTONS = "volume_button_setting";
public static final String KEY_WEEK_START = "week_start";
+ public static final String KEY_FLIP_ACTION = "flip_action";
+ public static final String KEY_SHAKE_ACTION = "shake_action";
public static final String DEFAULT_VOLUME_BEHAVIOR = "0";
public static final String VOLUME_BEHAVIOR_SNOOZE = "1";
@@ -171,6 +177,8 @@
case KEY_CLOCK_STYLE:
case KEY_WEEK_START:
case KEY_VOLUME_BUTTONS:
+ case KEY_FLIP_ACTION:
+ case KEY_SHAKE_ACTION:
final SimpleMenuPreference simpleMenuPreference = (SimpleMenuPreference) pref;
final int i = simpleMenuPreference.findIndexOfValue((String) newValue);
pref.setSummary(simpleMenuPreference.getEntries()[i]);
@@ -308,6 +316,33 @@
final Preference timerRingtonePref = findPreference(KEY_TIMER_RINGTONE);
timerRingtonePref.setOnPreferenceClickListener(this);
timerRingtonePref.setSummary(DataModel.getDataModel().getTimerRingtoneTitle());
+
+ SensorManager sensorManager = (SensorManager)
+ getActivity().getSystemService(Context.SENSOR_SERVICE);
+
+ final SimpleMenuPreference flipActionPref =
+ (SimpleMenuPreference) findPreference(KEY_FLIP_ACTION);
+ if (flipActionPref != null) {
+ List<Sensor> sensorList = sensorManager.getSensorList(Sensor.TYPE_ORIENTATION);
+ if (sensorList.size() < 1) { // This will be true if no orientation sensor
+ flipActionPref.setValue("0"); // Turn it off
+ } else {
+ flipActionPref.setSummary(flipActionPref.getEntry());
+ flipActionPref.setOnPreferenceChangeListener(this);
+ }
+ }
+
+ final SimpleMenuPreference shakeActionPref =
+ (SimpleMenuPreference) findPreference(KEY_SHAKE_ACTION);
+ if (shakeActionPref != null) {
+ List<Sensor> sensorList = sensorManager.getSensorList(Sensor.TYPE_ACCELEROMETER);
+ if (sensorList.size() < 1) { // This will be true if no accelerometer sensor
+ shakeActionPref.setValue("0"); // Turn it off
+ } else {
+ shakeActionPref.setSummary(shakeActionPref.getEntry());
+ shakeActionPref.setOnPreferenceChangeListener(this);
+ }
+ }
}
private void refreshListPreference(ListPreference preference) {
@@ -325,4 +360,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/deskclock/stopwatch/StopwatchFragment.java b/src/com/android/deskclock/stopwatch/StopwatchFragment.java
index fe91b37..381176e 100644
--- a/src/com/android/deskclock/stopwatch/StopwatchFragment.java
+++ b/src/com/android/deskclock/stopwatch/StopwatchFragment.java
@@ -239,40 +239,33 @@
}
}
- private void updateFab(@NonNull ImageView fab, boolean animate) {
+ private void updateFab(@NonNull ImageView fab) {
if (getStopwatch().isRunning()) {
- if (animate) {
- fab.setImageResource(R.drawable.ic_play_pause_animation);
- } else {
- fab.setImageResource(R.drawable.ic_play_pause);
- }
+ fab.setImageResource(R.drawable.ic_pause_24dp);
fab.setContentDescription(fab.getResources().getString(R.string.sw_pause_button));
} else {
- if (animate) {
- fab.setImageResource(R.drawable.ic_pause_play_animation);
- } else {
- fab.setImageResource(R.drawable.ic_pause_play);
- }
+ fab.setImageResource(R.drawable.ic_start_24dp);
fab.setContentDescription(fab.getResources().getString(R.string.sw_start_button));
}
fab.setVisibility(VISIBLE);
}
+ @Override
public void onUpdateFab(@NonNull ImageView fab) {
- updateFab(fab, false);
+ updateFab(fab);
}
@Override
public void onMorphFab(@NonNull ImageView fab) {
// Update the fab's drawable to match the current timer state.
- updateFab(fab, Utils.isNOrLater());
+ updateFab(fab);
// Animate the drawable.
AnimatorUtils.startDrawableAnimation(fab);
}
@Override
public void onUpdateFabButtons(@NonNull Button left, @NonNull Button right) {
- final Resources resources = getResources();
+ final Resources resources = left.getContext().getResources();
left.setClickable(true);
left.setText(R.string.sw_reset_button);
left.setContentDescription(resources.getString(R.string.sw_reset_button));
@@ -301,6 +294,11 @@
}
}
+ @Override
+ public final int getFabTargetVisibility() {
+ return View.VISIBLE;
+ }
+
/**
* @param color the newly installed app window color
*/
diff --git a/src/com/android/deskclock/timer/TimerFragment.java b/src/com/android/deskclock/timer/TimerFragment.java
index 8b30105..25ed2bf 100644
--- a/src/com/android/deskclock/timer/TimerFragment.java
+++ b/src/com/android/deskclock/timer/TimerFragment.java
@@ -236,7 +236,27 @@
}
}
- private void updateFab(@NonNull ImageView fab, boolean animate) {
+ @Override
+ public int getFabTargetVisibility() {
+ if (mCurrentView == mTimersView) {
+ final Timer timer = getTimer();
+ if (timer == null) {
+ return INVISIBLE;
+ } else {
+ return VISIBLE;
+ }
+ } else if (mCurrentView == mCreateTimerView) {
+ if (mCreateTimerView.hasValidInput()) {
+ return VISIBLE;
+ } else {
+ return INVISIBLE;
+ }
+ }
+
+ return INVISIBLE;
+ }
+
+ private void updateFab(@NonNull ImageView fab) {
if (mCurrentView == mTimersView) {
final Timer timer = getTimer();
if (timer == null) {
@@ -247,38 +267,26 @@
fab.setVisibility(VISIBLE);
switch (timer.getState()) {
case RUNNING:
- if (animate) {
- fab.setImageResource(R.drawable.ic_play_pause_animation);
- } else {
- fab.setImageResource(R.drawable.ic_play_pause);
- }
+ fab.setImageResource(R.drawable.ic_pause_24dp);
fab.setContentDescription(fab.getResources().getString(R.string.timer_stop));
break;
case RESET:
- if (animate) {
- fab.setImageResource(R.drawable.ic_stop_play_animation);
- } else {
- fab.setImageResource(R.drawable.ic_pause_play);
- }
+ fab.setImageResource(R.drawable.ic_start_24dp);
fab.setContentDescription(fab.getResources().getString(R.string.timer_start));
break;
case PAUSED:
- if (animate) {
- fab.setImageResource(R.drawable.ic_pause_play_animation);
- } else {
- fab.setImageResource(R.drawable.ic_pause_play);
- }
+ fab.setImageResource(R.drawable.ic_start_24dp);
fab.setContentDescription(fab.getResources().getString(R.string.timer_start));
break;
case MISSED:
case EXPIRED:
- fab.setImageResource(R.drawable.ic_stop_white_24dp);
+ fab.setImageResource(R.drawable.ic_stop_24dp);
fab.setContentDescription(fab.getResources().getString(R.string.timer_stop));
break;
}
} else if (mCurrentView == mCreateTimerView) {
if (mCreateTimerView.hasValidInput()) {
- fab.setImageResource(R.drawable.ic_start_white_24dp);
+ fab.setImageResource(R.drawable.ic_start_24dp);
fab.setContentDescription(fab.getResources().getString(R.string.timer_start));
fab.setVisibility(VISIBLE);
} else {
@@ -290,13 +298,13 @@
@Override
public void onUpdateFab(@NonNull ImageView fab) {
- updateFab(fab, false);
+ updateFab(fab);
}
@Override
public void onMorphFab(@NonNull ImageView fab) {
// Update the fab's drawable to match the current timer state.
- updateFab(fab, Utils.isNOrLater());
+ updateFab(fab);
// Animate the drawable.
AnimatorUtils.startDrawableAnimation(fab);
}
@@ -679,6 +687,11 @@
}
private Timer getTimer() {
+ if (mAdapter == null) {
+ TimerPagerAdapter adapter = new TimerPagerAdapter(getFragmentManager());
+ return adapter.getCount() == 0 ? null : adapter.getTimer(0);
+ }
+
if (mViewPager == null) {
return null;
}
diff --git a/src/com/android/deskclock/timer/TimerItemFragment.java b/src/com/android/deskclock/timer/TimerItemFragment.java
index 7ce6876..33b9042 100644
--- a/src/com/android/deskclock/timer/TimerItemFragment.java
+++ b/src/com/android/deskclock/timer/TimerItemFragment.java
@@ -16,12 +16,12 @@
package com.android.deskclock.timer;
-import android.app.Fragment;
import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import androidx.fragment.app.Fragment;
import com.android.deskclock.LabelDialogFragment;
import com.android.deskclock.R;
diff --git a/src/com/android/deskclock/timer/TimerPagerAdapter.java b/src/com/android/deskclock/timer/TimerPagerAdapter.java
index 5255f16..af923ea 100644
--- a/src/com/android/deskclock/timer/TimerPagerAdapter.java
+++ b/src/com/android/deskclock/timer/TimerPagerAdapter.java
@@ -17,15 +17,15 @@
package com.android.deskclock.timer;
import android.annotation.SuppressLint;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import androidx.legacy.app.FragmentCompat;
-import androidx.viewpager.widget.PagerAdapter;
import android.util.ArrayMap;
import android.view.View;
import android.view.ViewGroup;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.viewpager.widget.PagerAdapter;
+
import com.android.deskclock.data.DataModel;
import com.android.deskclock.data.Timer;
import com.android.deskclock.data.TimerListener;
@@ -137,7 +137,10 @@
if (mCurrentTransaction != null) {
mCurrentTransaction.commitAllowingStateLoss();
mCurrentTransaction = null;
- mFragmentManager.executePendingTransactions();
+
+ if (!mFragmentManager.isDestroyed()) {
+ mFragmentManager.executePendingTransactions();
+ }
}
}
@@ -179,7 +182,7 @@
}
private static void setItemVisible(Fragment item, boolean visible) {
- FragmentCompat.setMenuVisibility(item, visible);
- FragmentCompat.setUserVisibleHint(item, visible);
+ item.setMenuVisibility(visible);
+ item.setUserVisibleHint(visible);
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/deskclock/uidata/UiDataModel.java b/src/com/android/deskclock/uidata/UiDataModel.java
index f7a6917..3d592d4 100644
--- a/src/com/android/deskclock/uidata/UiDataModel.java
+++ b/src/com/android/deskclock/uidata/UiDataModel.java
@@ -19,7 +19,7 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Typeface;
-import androidx.annotation.DrawableRes;
+import androidx.annotation.IntegerRes;
import androidx.annotation.StringRes;
import com.android.deskclock.AlarmClockFragment;
@@ -39,23 +39,23 @@
/** Identifies each of the primary tabs within the application. */
public enum Tab {
- ALARMS(AlarmClockFragment.class, R.drawable.ic_tab_alarm, R.string.menu_alarm),
- CLOCKS(ClockFragment.class, R.drawable.ic_tab_clock, R.string.menu_clock),
- TIMERS(TimerFragment.class, R.drawable.ic_tab_timer, R.string.menu_timer),
- STOPWATCH(StopwatchFragment.class, R.drawable.ic_tab_stopwatch, R.string.menu_stopwatch);
+ ALARMS(AlarmClockFragment.class, R.id.page_alarm, R.string.menu_alarm),
+ CLOCKS(ClockFragment.class, R.id.page_clock, R.string.menu_clock),
+ TIMERS(TimerFragment.class, R.id.page_timer, R.string.menu_timer),
+ STOPWATCH(StopwatchFragment.class, R.id.page_stopwatch, R.string.menu_stopwatch);
private final String mFragmentClassName;
- private final @DrawableRes int mIconResId;
+ private final @IntegerRes int mPageResId;
private final @StringRes int mLabelResId;
- Tab(Class fragmentClass, @DrawableRes int iconResId, @StringRes int labelResId) {
+ Tab(Class fragmentClass, @IntegerRes int pageResId, @StringRes int labelResId) {
mFragmentClassName = fragmentClass.getName();
- mIconResId = iconResId;
+ mPageResId = pageResId;
mLabelResId = labelResId;
}
public String getFragmentClassName() { return mFragmentClassName; }
- public @DrawableRes int getIconResId() { return mIconResId; }
+ public @IntegerRes int getPageResId() { return mPageResId; }
public @StringRes int getLabelResId() { return mLabelResId; }
}
