am e598a85e: am 0b888f34: Use the application icon as the launcher icon.
Merge commit 'e598a85e324fcfe11fe27a90ad7e8954b78f4c01'
* commit 'e598a85e324fcfe11fe27a90ad7e8954b78f4c01':
Use the application icon as the launcher icon.
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 83fac29..2e50d17 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Budík byl nastaven na <xliff:g id="TIME">%s</xliff:g>. Můžete jej případně vybrat a zrušit."</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"Chování postranního tlačítka"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"Umožňuje nastavit chování postranních tlačítek při vyzvánění budíku"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"Žádné"</item>
<item msgid="7111908302622811168">"Odložit"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f8ecf74..e76c3e2 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Alarmen er indstillet til <xliff:g id="TIME">%s</xliff:g>. Vælg for at annullere."</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"Sideknaps adfærd"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"Indstil ønsket adfærd for sideknappen, når der trykkes på den under en alarm"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"Ingen"</item>
<item msgid="7111908302622811168">"Slumretilstand"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 94ad287..b9c53a4 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Wecker für <xliff:g id="TIME">%s</xliff:g> gestellt. Zum Abbrechen auswählen."</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"Verhalten der seitlichen Schaltfläche"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"Stellen Sie das gewünschte Verhalten der seitlichen Schaltflächen ein, wenn Sie während des Weckerklingelns gedrückt werden."</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"Keine"</item>
<item msgid="7111908302622811168">"Snooze-Funktion"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index e30fd1f..0fdc0a1 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Το ξυπνητήρι ρυθμίστηκε για τις <xliff:g id="TIME">%s</xliff:g>. Επιλέξτε για να ακυρώσετε."</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"Συμπεριφορά πλευρικού κουμπιού"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"Ορίστε την επιθυμητή συμπεριφορά των πλαϊνών κουμπιών κατά τον ήχο του ξυπνητηριού"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"Κανένα"</item>
<item msgid="7111908302622811168">"Αφύπνιση"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index a6a35f7..b7b23a1 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Esta alarma se activará en <xliff:g id="TIME">%s</xliff:g>. Selecciona para cancelar."</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"Comportamiento del botón lateral"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"Activar el comportamiento deseado de los botones laterales cuando se presionen durante una alarma"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"Ninguno"</item>
<item msgid="7111908302622811168">"Recurrente"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2e6f6f1..0703746 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"La alarma sonará a las <xliff:g id="TIME">%s</xliff:g>. Seleccione la opción para cancelarla."</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"Comportamiento de botón lateral"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"Establecer el comportamiento deseado de los botones laterales cuando se pulsan durante una alarma"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"Ninguno"</item>
<item msgid="7111908302622811168">"Posponer"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d873da2..2017030 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Prochaine alarme dans <xliff:g id="TIME">%s</xliff:g>. Sélectionnez l\'option appropriée pour annuler."</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"Action du bouton latéral"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"Définissez les actions effectuées par les boutons latéraux lors d\'une alarme."</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"Aucune"</item>
<item msgid="7111908302622811168">"Répéter"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index db672e8..1989fb3 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"L\'allarme sarà attivato alle <xliff:g id="TIME">%s</xliff:g>. Seleziona per annullare."</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"Comportamento pulsante laterale"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"Imposta il comportamento desiderato dei pulsanti laterali quando vengono premuti durante un allarme"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"Nessuno"</item>
<item msgid="7111908302622811168">"Sospendi"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 51d5298..65ccbfb 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"アラームは<xliff:g id="TIME">%s</xliff:g>に設定されています。選択すると解除されます。"</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"サイドボタンの動作"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"アラームが鳴っているときにサイドボタンを押した場合の動作を設定します"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"なし"</item>
<item msgid="7111908302622811168">"スヌーズ"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0553254..067b051 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"<xliff:g id="TIME">%s</xliff:g> 후로 알람이 설정되었습니다. 취소하려면 선택하세요."</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"사이드 버튼 동작"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"알람이 울리는 동안 사이드 버튼을 눌렀을 때의 동작 설정"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"없음"</item>
<item msgid="7111908302622811168">"다시 울림"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 335ac7d..666fbc2 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -35,14 +35,14 @@
<string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Slumre"</string>
<string name="alarm_alert_snooze_set" msgid="656470966696912087">"Slumrer i <xliff:g id="MINUTES">%d</xliff:g> minutter."</string>
<string-array name="alarm_set">
- <item msgid="5163476010406761625">"Alarmen ringer om mindre enn ett minutt."</item>
- <item msgid="7110525731259629055">"Alarmen ringer om <xliff:g id="DAYS">%1$s</xliff:g>."</item>
- <item msgid="7003982794086186185">"Alarmen ringer om <xliff:g id="HOURS">%2$s</xliff:g>."</item>
- <item msgid="7311021123230077742">"Alarmen ringer om <xliff:g id="DAYS">%1$s</xliff:g> og <xliff:g id="HOURS">%2$s</xliff:g>."</item>
- <item msgid="8431715191823114872">"Alarmen ringer om <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
- <item msgid="3244151088673185428">"Alarmen ringer om <xliff:g id="DAYS">%1$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
- <item msgid="3663661342600168814">"Alarmen ringer om <xliff:g id="HOURS">%2$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
- <item msgid="7779544127785487304">"Alarmen ringer om <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
+ <item msgid="5163476010406761625">"Denne alarmen er innstilt på under ett minutt fra nå."</item>
+ <item msgid="7110525731259629055">"Denne alarmen er innstilt på <xliff:g id="DAYS">%1$s</xliff:g> fra nå."</item>
+ <item msgid="7003982794086186185">"Denne alarmen er innstilt på <xliff:g id="HOURS">%2$s</xliff:g> fra nå."</item>
+ <item msgid="7311021123230077742">"Denne alarmen er innstilt på <xliff:g id="DAYS">%1$s</xliff:g> og <xliff:g id="HOURS">%2$s</xliff:g> fra nå."</item>
+ <item msgid="8431715191823114872">"Denne alarmen er innstilt på <xliff:g id="MINUTES">%3$s</xliff:g> fra nå."</item>
+ <item msgid="3244151088673185428">"Denne alarmen er innstilt på <xliff:g id="DAYS">%1$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g> fra nå."</item>
+ <item msgid="3663661342600168814">"Denne alarmen er innstilt på <xliff:g id="HOURS">%2$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g> fra nå."</item>
+ <item msgid="7779544127785487304">"Denne alarmen er innstilt på <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g> fra nå."</item>
</string-array>
<string name="day" msgid="7984755014526510295">"1 dag"</string>
<string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> dager"</string>
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Alarmen er innstilt på <xliff:g id="TIME">%s</xliff:g>. Velg for å avbryte."</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"Sideknappfunksjon"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"Angi hvilken funksjon du vil at sideknappene skal ha når de trykkes på under en alarm"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"Ingen"</item>
<item msgid="7111908302622811168">"Slumre"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e78680e..b691317 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Alarm is ingesteld voor <xliff:g id="TIME">%s</xliff:g>. Selecteer om te annuleren."</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"Gedrag van zijknop"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"Stel het gewenste gedrag van de zijknoppen in wanneer hierop wordt gedrukt tijdens een alarm"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"Geen"</item>
<item msgid="7111908302622811168">"Snooze"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 71127b7..cf93b85 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Alarm ustawiony na godzinę <xliff:g id="TIME">%s</xliff:g>. Wybierz, aby anulować."</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"Działanie bocznego przycisku"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"Ustaw żądane działanie bocznych przycisków przy naciśnięciu podczas alarmu"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"Brak"</item>
<item msgid="7111908302622811168">"Uśpij"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index d5b3b14..82b1d7e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Alarme definido para a(s) <xliff:g id="TIME">%s</xliff:g>. Seleccione para cancelar."</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"Comportamento do botão lateral"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"Definir o comportamento pretendido dos botões laterais quando premidos durante um alarme"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"Nenhum"</item>
<item msgid="7111908302622811168">"Suspender"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index c960d01..a21cf86 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Alarme definido para <xliff:g id="TIME">%s</xliff:g>. Selecione para cancelar."</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"Comportamento do botão lateral"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"Defina o comportamento desejado dos botões laterais quando pressionados durante um alarme"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"Nenhuma"</item>
<item msgid="7111908302622811168">"Colocar em modo de espera"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b77e478..14a7810 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Будильник зазвонит в <xliff:g id="TIME">%s</xliff:g>. Отменить?"</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"Функции боковой кнопки"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"Настройка функции боковой кнопки при ее нажатии во время звонка будильника"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"Нет"</item>
<item msgid="7111908302622811168">"Спящий режим"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 6e77500..260a3bb 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Alarmet ringer <xliff:g id="TIME">%s</xliff:g>. Välj om du vill avbryta."</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"Sidoknappens funktion"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"Ange önskad funktion för sidoknapparna om de används under ett alarm"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"Inga"</item>
<item msgid="7111908302622811168">"Snooze"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 8f3e51e..e03623d 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"<xliff:g id="TIME">%s</xliff:g> için alarm ayarlandı. İptal etmek için seçin."</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"Yan düğme işlevi"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"Alarm sırasında basıldığında yan düğmenin nasıl işlev görmesini istediğinizi ayarlayın"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"Yok"</item>
<item msgid="7111908302622811168">"Ertele"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 9406f80..477ff40 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"已将闹钟设置为从现在起 <xliff:g id="TIME">%s</xliff:g>后再提醒。选中可以取消。"</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"侧按钮行为"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"根据需要设置闹钟响时按侧按钮所期望出现的行为"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"无"</item>
<item msgid="7111908302622811168">"暂停"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 5ea5413..6f60110 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -85,8 +85,6 @@
<string name="alarm_notify_snooze_text" msgid="8004830999152609519">"已將鬧鐘設定在 <xliff:g id="TIME">%s</xliff:g>，選取即可取消。"</string>
<string name="volume_button_setting_title" msgid="1892885285888644234">"側邊按鈕功用"</string>
<string name="volume_button_setting_summary" msgid="1594641247799573198">"設定側邊按鈕在鬧鐘啟動時的功用"</string>
- <!-- no translation found for default_ringtone_setting_title (4549726190682964245) -->
- <skip />
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"無"</item>
<item msgid="7111908302622811168">"貪睡"</item>
