OSDN Git Service

am f1e8069b: UI tweaks to meet Jeff\'s spec.
authorPatrick Scott <phanna@android.com>
Wed, 18 Nov 2009 20:20:53 +0000 (12:20 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Nov 2009 20:20:53 +0000 (12:20 -0800)
Merge commit 'f1e8069bcd1755d9ef2322b705d8d9d6b83728f0' into eclair-mr2

* commit 'f1e8069bcd1755d9ef2322b705d8d9d6b83728f0':
  UI tweaks to meet Jeff's spec.

21 files changed:
1  2 
res/values-cs/strings.xml
res/values-da/strings.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-es-rUS/strings.xml
res/values-es/strings.xml
res/values-fr/strings.xml
res/values-it/strings.xml
res/values-ja/strings.xml
res/values-ko/strings.xml
res/values-nb/strings.xml
res/values-nl/strings.xml
res/values-pl/strings.xml
res/values-pt-rPT/strings.xml
res/values-pt/strings.xml
res/values-ru/strings.xml
res/values-sv/strings.xml
res/values-tr/strings.xml
res/values-zh-rCN/strings.xml
res/values-zh-rTW/strings.xml
src/com/android/deskclock/AlarmClock.java

  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"Hodiny"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"Budíky"</string>
 +    <string name="app_label" msgid="6642875149600019623">"Budík"</string>
      <string name="add_alarm" msgid="5976616107390962899">"Přidat budík"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"Smazat budík"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"Aktivovat budík"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"Deaktivovat budík"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"Tento budík bude smazán."</string>
      <string name="show_clock" msgid="8358759982675616915">"Zobrazit hodiny"</string>
      <string name="hide_clock" msgid="3217727306480505694">"Skrýt hodiny"</string>
      <string name="done" msgid="6509722361933858451">"Hotovo"</string>
      <string name="revert" msgid="9100911171235162926">"Vrátit zpět"</string>
      <string name="alarm_volume_title" msgid="8506245173912428522">"Hlasitost budíku"</string>
 -    <string name="alarm_volume_summary" msgid="8957440373896242438">"Nastavení hlasitosti budíků"</string>
 +    <string name="alarm_volume_summary" msgid="8957440373896242438">"Nastavit hlasitost budíků"</string>
      <string name="silent_alarm_summary" msgid="8605302849408279221">"Tichý"</string>
      <string name="alarm_notify_text" msgid="4146350965933990093">"Vyberte, zda budík chcete ukončit nebo odložit."</string>
      <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (odloženo)"</string>
      <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ích tlačítek"</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>
    <string-array name="volume_button_setting_entries">
      <item msgid="4520420953175098625">"Žádné"</item>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"Budíky"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"Galerie"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"Hudba"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"Ztlumit"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"Ur"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmer"</string>
 +    <string name="app_label" msgid="6642875149600019623">"Alarm"</string>
      <string name="add_alarm" msgid="5976616107390962899">"Tilføj alarm"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"Slet alarm"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"Aktiver alarm"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"Deaktiver alarm"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"Denne alarm slettes."</string>
      <string name="show_clock" msgid="8358759982675616915">"Vis ur"</string>
      <string name="hide_clock" msgid="3217727306480505694">"Skjul ur"</string>
      <string name="label" msgid="162189613902857319">"Etiket"</string>
      <string name="default_label" msgid="5590025289805630372">"Alarm"</string>
 -    <string name="set_alarm" msgid="9148359866152726808">"Angiv alarm"</string>
 -    <string name="alarm_vibrate" msgid="3476686921490362230">"Vibration"</string>
 +    <string name="set_alarm" msgid="9148359866152726808">"Indstil alarm"</string>
 +    <string name="alarm_vibrate" msgid="3476686921490362230">"Vibrer"</string>
      <string name="alarm_repeat" msgid="7242985466344233206">"Gentag"</string>
      <string name="alert" msgid="6539852766423700221">"Ringetone"</string>
      <string name="time" msgid="8067216534232296518">"Tid"</string>
      <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Annuller"</string>
 -    <string name="alarm_alert_alert_silenced" msgid="7918075929961104202">"Alarm slukkes efter <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
 +    <string name="alarm_alert_alert_silenced" msgid="7918075929961104202">"Alarm dæmpes efter <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
      <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Slumretilstand"</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">
      <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> timer"</string>
      <string name="minute" msgid="2486157997434653710">"1 minut"</string>
      <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutter"</string>
 -    <string name="every_day" msgid="1058994798884544691">"hver dag"</string>
 +    <string name="every_day" msgid="1058994798884544691">"Hver dag"</string>
      <string name="never" msgid="54104287800571769">"Aldrig"</string>
      <string name="day_concat" msgid="971998564991636532">", "</string>
 -    <string name="clock_instructions" msgid="3118560284915857690">"Vælg det ur, der skal vises."</string>
 +    <string name="clock_instructions" msgid="3118560284915857690">"Vælg et ur, der skal vises."</string>
      <string name="analog_gadget" msgid="1670505720837152766">"Analogt ur"</string>
      <string name="settings" msgid="5849739030579520686">"Indstillinger"</string>
 -    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarm i lydløs tilstand"</string>
 +    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarm er i lydløs tilstand"</string>
      <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"Afspil alarm, selvom telefonen er i lydløs tilstand"</string>
      <string name="snooze_duration_title" msgid="1471249885139952670">"Slumretilstands varighed"</string>
    <string-array name="snooze_duration_entries">
      <item msgid="6048861883552402852">"25"</item>
      <item msgid="2740866721232379791">"30"</item>
    </string-array>
 -    <string name="done" msgid="6509722361933858451">"Udfør"</string>
 -    <string name="revert" msgid="9100911171235162926">"Annuller"</string>
 -    <string name="alarm_volume_title" msgid="8506245173912428522">"Lydstyrke for alarm"</string>
 -    <string name="alarm_volume_summary" msgid="8957440373896242438">"Angiv alarmernes lydstyrke"</string>
 +    <string name="done" msgid="6509722361933858451">"Færdig"</string>
 +    <string name="revert" msgid="9100911171235162926">"Vend tilbage"</string>
 +    <string name="alarm_volume_title" msgid="8506245173912428522">"Alarmlydstyrke"</string>
 +    <string name="alarm_volume_summary" msgid="8957440373896242438">"Indstil alarmernes lydstyrke"</string>
      <string name="silent_alarm_summary" msgid="8605302849408279221">"Lydløs"</string>
      <string name="alarm_notify_text" msgid="4146350965933990093">"Vælg for at slumre eller annullere alarmen."</string>
      <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (slumretilstand)"</string>
      <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">"Angiv ønsket adfærd for sideknapperne, når der trykkes på dem under en alarm"</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>
    <string-array name="volume_button_setting_entries">
      <item msgid="4520420953175098625">"Ingen"</item>
      <item msgid="7111908302622811168">"Slumretilstand"</item>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"Alarmer"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"Galleri"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"Musik"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"Dæmp"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"Uhr"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"Wecker"</string>
 +    <string name="app_label" msgid="6642875149600019623">"Wecker"</string>
      <string name="add_alarm" msgid="5976616107390962899">"Wecker hinzufügen"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"Wecker löschen"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"Wecker aktivieren"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"Wecker deaktivieren"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"Dieser Alarm wird gelöscht."</string>
      <string name="show_clock" msgid="8358759982675616915">"Uhr anzeigen"</string>
      <string name="hide_clock" msgid="3217727306480505694">"Uhr ausblenden"</string>
      <string name="alarm_volume_title" msgid="8506245173912428522">"Lautstärke für Alarm"</string>
      <string name="alarm_volume_summary" msgid="8957440373896242438">"Lautstärke des Weckers einstellen"</string>
      <string name="silent_alarm_summary" msgid="8605302849408279221">"Lautlos"</string>
 -    <string name="alarm_notify_text" msgid="4146350965933990093">"Für Snooze-Funktion oder Beenden auswählen"</string>
 +    <string name="alarm_notify_text" msgid="4146350965933990093">"Für Snooze-Funktion oder Ablehnen der Weckerfunktion auswählen"</string>
      <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (Snooze)"</string>
      <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">"Funktion der seitlichen Tasten"</string>
 -    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Verhalten der seitlichen Tasten während des Weckerklingelns"</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>
    <string-array name="volume_button_setting_entries">
      <item msgid="4520420953175098625">"Keine"</item>
      <item msgid="7111908302622811168">"Snooze-Funktion"</item>
 -    <item msgid="8573552194573068996">"Beenden"</item>
 +    <item msgid="8573552194573068996">"Verwerfen"</item>
    </string-array>
    <string-array name="volume_button_setting_values">
      <item msgid="4851033050639608752">"0"</item>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"Wecker"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"Galerie"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"Musik"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"Dimmen"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"Ρολόι"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"Ειδοποιήσεις"</string>
 +    <string name="app_label" msgid="6642875149600019623">"Ξυπνητήρι"</string>
      <string name="add_alarm" msgid="5976616107390962899">"Προσθήκη ξυπνητηριού"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"Διαγραφή ξυπνητηριού"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"Ενεργοποίηση ξυπνητηριού"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"Απενεργοποίηση ξυπνητηριού"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"Αυτό το ξυπνητήρι θα διαγραφεί."</string>
      <string name="show_clock" msgid="8358759982675616915">"Εμφάνιση ρολογιού"</string>
      <string name="hide_clock" msgid="3217727306480505694">"Απόκρυψη ρολογιού"</string>
@@@ -78,7 -78,7 +77,7 @@@
      <string name="done" msgid="6509722361933858451">"Τέλος"</string>
      <string name="revert" msgid="9100911171235162926">"Επαναφορά"</string>
      <string name="alarm_volume_title" msgid="8506245173912428522">"Ένταση ήχου ξυπνητηριού"</string>
 -    <string name="alarm_volume_summary" msgid="8957440373896242438">"Î\9fÏ\81ιÏ\83μÏ\8cÏ\82 Ï\84ηÏ\82 Î­Î½Ï\84αÏ\83ηÏ\82 Ï\84οÏ\85 Î®Ï\87οÏ\85 Î¾Ï\85Ï\80νηÏ\84ηÏ\81ιοÏ\8d"</string>
 +    <string name="alarm_volume_summary" msgid="8957440373896242438">"Î\9fÏ\81ιÏ\83μÏ\8cÏ\82 Ï\84οÏ\85 Î±Ï\81ιθμοÏ\8d Ï\84Ï\89ν ÎµÎ¹Î´Î¿Ï\80οιήÏ\83εÏ\89ν"</string>
      <string name="silent_alarm_summary" msgid="8605302849408279221">"Σίγαση"</string>
      <string name="alarm_notify_text" msgid="4146350965933990093">"Επιλέξτε την αφύπνιση ή την παράβλεψη σε αυτό το ξυπνητήρι."</string>
      <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (αναβολή)"</string>
@@@ -86,7 -86,7 +85,7 @@@
      <string name="volume_button_setting_title" msgid="1892885285888644234">"Συμπεριφορά πλευρικού κουμπιού"</string>
      <string name="volume_button_setting_summary" msgid="1594641247799573198">"Ορίστε την επιθυμητή συμπεριφορά των πλαϊνών κουμπιών κατά τον ήχο του ξυπνητηριού"</string>
    <string-array name="volume_button_setting_entries">
 -    <item msgid="4520420953175098625">"Î\9aαμία"</item>
 +    <item msgid="4520420953175098625">"Î\9aανένα"</item>
      <item msgid="7111908302622811168">"Αφύπνιση"</item>
      <item msgid="8573552194573068996">"Παράβλεψη"</item>
    </string-array>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"Ειδοποιήσεις"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"Συλλογή"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"Μουσική"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"Θάμπωμα"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"Εκκίνηση"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"Reloj"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmas"</string>
 +    <string name="app_label" msgid="6642875149600019623">"Alarma"</string>
      <string name="add_alarm" msgid="5976616107390962899">"Agregar alarma"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"Eliminar alarma"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"Activar alarma"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"Desactivar alarma"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"Esta alarma se eliminará"</string>
      <string name="show_clock" msgid="8358759982675616915">"Mostrar reloj"</string>
      <string name="hide_clock" msgid="3217727306480505694">"Ocultar reloj"</string>
@@@ -55,8 -55,8 +54,8 @@@
      <string name="day_concat" msgid="971998564991636532">", "</string>
      <string name="clock_instructions" msgid="3118560284915857690">"Selecciona un reloj."</string>
      <string name="analog_gadget" msgid="1670505720837152766">"Reloj analógico"</string>
 -    <string name="settings" msgid="5849739030579520686">"Config."</string>
 -    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarma en modo silencio"</string>
 +    <string name="settings" msgid="5849739030579520686">"Configuración"</string>
 +    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarma en modo silencioso"</string>
      <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"Reproducir alarma cuando el teléfono está en modo silencioso"</string>
      <string name="snooze_duration_title" msgid="1471249885139952670">"Duración de recurrencia"</string>
    <string-array name="snooze_duration_entries">
@@@ -83,8 -83,8 +82,8 @@@
      <string name="alarm_notify_text" msgid="4146350965933990093">"Seleccionar alarma recurrente o rechazar."</string>
      <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (recurrente)"</string>
      <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">"Comport. del botón lateral"</string>
 -    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Activar el comport. deseado de los botones lat. durante una alarma"</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>
    <string-array name="volume_button_setting_entries">
      <item msgid="4520420953175098625">"Ninguno"</item>
      <item msgid="7111908302622811168">"Recurrente"</item>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"Alarmas"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"Galería"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"Música"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"Atenuar"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"Segmento <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"Reloj"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmas"</string>
 +    <string name="app_label" msgid="6642875149600019623">"Alarma"</string>
      <string name="add_alarm" msgid="5976616107390962899">"Añadir alarma"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"Eliminar alarma"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"Activar alarma"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"Desactivar alarma"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"Esta alarma se eliminará."</string>
      <string name="show_clock" msgid="8358759982675616915">"Mostrar reloj"</string>
      <string name="hide_clock" msgid="3217727306480505694">"Ocultar reloj"</string>
      <string name="alarm_volume_title" msgid="8506245173912428522">"Volumen de alarma"</string>
      <string name="alarm_volume_summary" msgid="8957440373896242438">"Establecer el volumen de las alarmas"</string>
      <string name="silent_alarm_summary" msgid="8605302849408279221">"Silencio"</string>
 -    <string name="alarm_notify_text" msgid="4146350965933990093">"Elige si deseas posponer o descartar esta alarma."</string>
 +    <string name="alarm_notify_text" msgid="4146350965933990093">"Elija si desea posponer o descartar esta alarma."</string>
      <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (pospuesta)"</string>
 -    <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"La alarma sonará a las <xliff:g id="TIME">%s</xliff:g>. Selecciona la opción para cancelarla."</string>
 -    <string name="volume_button_setting_title" msgid="1892885285888644234">"Comportamiento de los botones laterales"</string>
 +    <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>
    <string-array name="volume_button_setting_entries">
      <item msgid="4520420953175098625">"Ninguno"</item>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"Alarmas"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"Galería"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"Música"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"Atenuar"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"Página principal"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"Horloge"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmes"</string>
 +    <string name="app_label" msgid="6642875149600019623">"Réveil"</string>
      <string name="add_alarm" msgid="5976616107390962899">"Ajouter alarme"</string>
 -    <string name="delete_alarm" msgid="3457780990646206817">"Supprimer l\'alarme"</string>
 +    <string name="delete_alarm" msgid="3457780990646206817">"Désactiver l\'alarme"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"Activer l\'alarme"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"Désactiver l\'alarme"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"Cette alarme va être supprimée."</string>
      <string name="show_clock" msgid="8358759982675616915">"Afficher l\'horloge"</string>
      <string name="hide_clock" msgid="3217727306480505694">"Masquer l\'horloge"</string>
@@@ -84,7 -84,7 +83,7 @@@
      <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (répétition)"</string>
      <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 actions effectuées par boutons latéraux lors d\'une alarme"</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>
    <string-array name="volume_button_setting_entries">
      <item msgid="4520420953175098625">"Aucune"</item>
      <item msgid="7111908302622811168">"Répéter"</item>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"Alarmes"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"Galerie"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"Musique"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"Assombrir"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"Lanceur"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"Orologio"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"Sveglia"</string>
 +    <string name="app_label" msgid="6642875149600019623">"Sveglia"</string>
      <string name="add_alarm" msgid="5976616107390962899">"Aggiungi allarme"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"Elimina allarme"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"Attiva allarme"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"Disattiva allarme"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"Questa sveglia verrà eliminata."</string>
      <string name="show_clock" msgid="8358759982675616915">"Mostra orologio"</string>
      <string name="hide_clock" msgid="3217727306480505694">"Nascondi orologio"</string>
@@@ -56,7 -56,7 +55,7 @@@
      <string name="clock_instructions" msgid="3118560284915857690">"Seleziona un orologio."</string>
      <string name="analog_gadget" msgid="1670505720837152766">"Orologio analogico"</string>
      <string name="settings" msgid="5849739030579520686">"Impostazioni"</string>
 -    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Allarme in mod. silenz."</string>
 +    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Allarme in mod. silenziosa"</string>
      <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"Riproduci allarme anche con telefono in modalità silenziosa"</string>
      <string name="snooze_duration_title" msgid="1471249885139952670">"Durata sospensione"</string>
    <string-array name="snooze_duration_entries">
@@@ -83,8 -83,8 +82,8 @@@
      <string name="alarm_notify_text" msgid="4146350965933990093">"Seleziona per sospendere o eliminare questo allarme."</string>
      <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (sospeso)"</string>
      <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">"Comp. pulsante laterale"</string>
 -    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Imposta il comport. dei puls. laterali quando vengono premuti durante un allarme"</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>
    <string-array name="volume_button_setting_entries">
      <item msgid="4520420953175098625">"Nessuno"</item>
      <item msgid="7111908302622811168">"Sospendi"</item>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"Sveglia"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"Galleria"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"Musica"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"Abbassa"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"時計"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"アラーム"</string>
 +    <string name="app_label" msgid="6642875149600019623">"アラーム"</string>
      <string name="add_alarm" msgid="5976616107390962899">"アラームの設定"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"アラームを削除"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"アラームON"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"アラームOFF"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"このアラームを削除します。"</string>
      <string name="show_clock" msgid="8358759982675616915">"時計を表示"</string>
      <string name="hide_clock" msgid="3217727306480505694">"時計を隠す"</string>
      <string name="alarm_alert_snooze_set" msgid="656470966696912087">"<xliff:g id="MINUTES">%d</xliff:g>分後に再通知します"</string>
    <string-array name="alarm_set">
      <item msgid="5163476010406761625">"アラームは今から1分以内に設定されています。"</item>
 -    <item msgid="7110525731259629055">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>後に設定されています。"</item>
 -    <item msgid="7003982794086186185">"アラームは<xliff:g id="HOURS">%2$s</xliff:g>後に設定されています。"</item>
 -    <item msgid="7311021123230077742">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>と<xliff:g id="HOURS">%2$s</xliff:g>後に設定されています。"</item>
 -    <item msgid="8431715191823114872">"アラームは<xliff:g id="MINUTES">%3$s</xliff:g>後に設定されています。"</item>
 -    <item msgid="3244151088673185428">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>と<xliff:g id="MINUTES">%3$s</xliff:g>後に設定されています。"</item>
 -    <item msgid="3663661342600168814">"アラームは<xliff:g id="HOURS">%2$s</xliff:g><xliff:g id="MINUTES">%3$s</xliff:g>後に設定されています。"</item>
 -    <item msgid="7779544127785487304">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>と<xliff:g id="HOURS">%2$s</xliff:g><xliff:g id="MINUTES">%3$s</xliff:g>後に設定されています。"</item>
 +    <item msgid="7110525731259629055">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>後に設定されています。"</item>
 +    <item msgid="7003982794086186185">"アラームは<xliff:g id="HOURS">%2$s</xliff:g>時間後に設定されています。"</item>
 +    <item msgid="7311021123230077742">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>日と<xliff:g id="HOURS">%2$s</xliff:g>時間後に設定されています。"</item>
 +    <item msgid="8431715191823114872">"ã\82¢ã\83©ã\83¼ã\83 ã\81¯<xliff:g id="MINUTES">%3$s</xliff:g>å\88\86å¾\8cã\81«è¨­å®\9aã\81\95ã\82\8cã\81¦ã\81\84ã\81¾ã\81\99ã\80\82"</item>
 +    <item msgid="3244151088673185428">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>日と<xliff:g id="MINUTES">%3$s</xliff:g>分後に設定されています。"</item>
 +    <item msgid="3663661342600168814">"アラームは<xliff:g id="HOURS">%2$s</xliff:g>時間<xliff:g id="MINUTES">%3$s</xliff:g>分後に設定されています。"</item>
 +    <item msgid="7779544127785487304">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>日と<xliff:g id="HOURS">%2$s</xliff:g>時間<xliff:g id="MINUTES">%3$s</xliff:g>分後に設定されています。"</item>
    </string-array>
      <string name="day" msgid="7984755014526510295">"1日"</string>
      <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g>日"</string>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"アラーム"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"ギャラリー"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"音楽"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"暗くする"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"ランチャー"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"시계"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"알람"</string>
 +    <string name="app_label" msgid="6642875149600019623">"알람"</string>
      <string name="add_alarm" msgid="5976616107390962899">"알람 추가"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"알람 삭제"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"알람 사용"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"알람 사용 중지"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"알람이 삭제됩니다."</string>
      <string name="show_clock" msgid="8358759982675616915">"시계 표시"</string>
      <string name="hide_clock" msgid="3217727306480505694">"시계 숨기기"</string>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"알람"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"갤러리"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"음악"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"낮추기"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"Klokke"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmer"</string>
 +    <string name="app_label" msgid="6642875149600019623">"Alarm"</string>
      <string name="add_alarm" msgid="5976616107390962899">"Legg til alarm"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"Slett alarm"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"Aktiver alarm"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"Deaktiver alarm"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"Denne alarmen vil bli slettet."</string>
      <string name="show_clock" msgid="8358759982675616915">"Vis klokke"</string>
      <string name="hide_clock" msgid="3217727306480505694">"Skjul klokke"</string>
      <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>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"Alarmer"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"Galleri"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"Musikk"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"Demp"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"Hjem"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"Klok"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmen"</string>
 +    <string name="app_label" msgid="6642875149600019623">"Wekker"</string>
      <string name="add_alarm" msgid="5976616107390962899">"Alarm toevoegen"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"Alarm verwijderen"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"Alarm inschakelen"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"Alarm uitschakelen"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"Dit alarm wordt verwijderd."</string>
      <string name="show_clock" msgid="8358759982675616915">"Klok weergeven"</string>
      <string name="hide_clock" msgid="3217727306480505694">"Klok verbergen"</string>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"Alarmen"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"Galerij"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"Muziek"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"Dimmen"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"Zegar"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmy"</string>
 +    <string name="app_label" msgid="6642875149600019623">"Budzik"</string>
      <string name="add_alarm" msgid="5976616107390962899">"Dodaj alarm"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"Usuń alarm"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"Włącz alarm"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"Wyłącz alarm"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"Ten zegar zostanie usunięty."</string>
      <string name="show_clock" msgid="8358759982675616915">"Pokaż zegar"</string>
      <string name="hide_clock" msgid="3217727306480505694">"Ukryj zegar"</string>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"Alarmy"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"Galeria"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"Muzyka"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"Przyciemnij"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"Program uruchamiający"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"Relógio"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmes"</string>
 +    <string name="app_label" msgid="6642875149600019623">"Despertador"</string>
      <string name="add_alarm" msgid="5976616107390962899">"Adicionar alarme"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"Eliminar alarme"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"Activar alarme"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"Desactivar alarme"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"Este alarme será eliminado."</string>
      <string name="show_clock" msgid="8358759982675616915">"Mostrar relógio"</string>
      <string name="hide_clock" msgid="3217727306480505694">"Ocultar relógio"</string>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"Alarmes"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"Galeria"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"Música"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"Esbater"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"Relógio"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmes"</string>
 +    <string name="app_label" msgid="6642875149600019623">"Despertador"</string>
      <string name="add_alarm" msgid="5976616107390962899">"Adicionar alarme"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"Excluir alarme"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"Ativar alarme"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"Desativar alarme"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"Este alarme será excluído."</string>
      <string name="show_clock" msgid="8358759982675616915">"Mostrar relógio"</string>
      <string name="hide_clock" msgid="3217727306480505694">"Ocultar relógio"</string>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"Alarmes"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"Galeria"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"Música"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"Escurecer"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"Часы"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"Будильник"</string>
 +    <string name="app_label" msgid="6642875149600019623">"Будильник"</string>
      <string name="add_alarm" msgid="5976616107390962899">"Добавить будильник"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"Удалить будильник"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"Включить будильник"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"Отключить будильник"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"Сигнал будет удален."</string>
      <string name="show_clock" msgid="8358759982675616915">"Показать часы"</string>
      <string name="hide_clock" msgid="3217727306480505694">"Спрятать часы"</string>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"Будильник"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"Фотоальбом"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"Музыка"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"Затемнить"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"Klocka"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"Alarm"</string>
 +    <string name="app_label" msgid="6642875149600019623">"Alarm"</string>
      <string name="add_alarm" msgid="5976616107390962899">"Lägg till alarm"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"Ta bort alarm"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"Aktivera alarmet"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"Inaktivera alarmet"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"Alarmet tas bort."</string>
      <string name="show_clock" msgid="8358759982675616915">"Visa klocka"</string>
      <string name="hide_clock" msgid="3217727306480505694">"Dölj klocka"</string>
@@@ -84,9 -84,9 +83,9 @@@
      <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (snoozat)"</string>
      <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 sidoknappen under alarm"</string>
 +    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Ange önskad funktion för sidoknapparna om de används under ett alarm"</string>
    <string-array name="volume_button_setting_entries">
 -    <item msgid="4520420953175098625">"Ingen"</item>
 +    <item msgid="4520420953175098625">"Inga"</item>
      <item msgid="7111908302622811168">"Snooze"</item>
      <item msgid="8573552194573068996">"Ta bort permanent"</item>
    </string-array>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"Alarm"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"Galleri"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"Musik"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"Dämpa"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"Startbild"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"Saat"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmlar"</string>
 +    <string name="app_label" msgid="6642875149600019623">"Çalar Saat"</string>
      <string name="add_alarm" msgid="5976616107390962899">"Alarm ekle"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"Alarmı sil"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"Alarmı etkinleştir"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"Alarmı devre dışı bırak"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"Bu alarm silinecek."</string>
      <string name="show_clock" msgid="8358759982675616915">"Saati göster"</string>
      <string name="hide_clock" msgid="3217727306480505694">"Saati gizle"</string>
@@@ -84,7 -84,7 +83,7 @@@
      <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (ertelendi)"</string>
      <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 istenen yan düğme işlevini ayarlayın"</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>
    <string-array name="volume_button_setting_entries">
      <item msgid="4520420953175098625">"Yok"</item>
      <item msgid="7111908302622811168">"Ertele"</item>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"Alarm çalar"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"Galeri"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"Müzik"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"Loş"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"Başlatıcı"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <string name="app_label" msgid="6674495003718166674">"时钟"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"闹钟"</string>
 +    <string name="app_label" msgid="6642875149600019623">"闹钟"</string>
      <string name="add_alarm" msgid="5976616107390962899">"添加闹钟"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"取消闹钟"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"启用闹钟"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"停用闹钟"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"将会取消此闹钟。"</string>
      <string name="show_clock" msgid="8358759982675616915">"显示时钟"</string>
      <string name="hide_clock" msgid="3217727306480505694">"隐藏时钟"</string>
      <string name="alarm_alert_snooze_set" msgid="656470966696912087">"暂停 <xliff:g id="MINUTES">%d</xliff:g> 分钟。"</string>
    <string-array name="alarm_set">
      <item msgid="5163476010406761625">"已将此闹钟设置为从现在起不到 1 分钟后提醒。"</item>
 -    <item msgid="7110525731259629055">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g>后启动。"</item>
 -    <item msgid="7003982794086186185">"已将此闹钟设置为从现在起 <xliff:g id="HOURS">%2$s</xliff:g>后启动。"</item>
 -    <item msgid="7311021123230077742">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g>后启动。"</item>
 -    <item msgid="8431715191823114872">"已将此闹钟设置为从现在起 <xliff:g id="MINUTES">%3$s</xliff:g>后启动。"</item>
 -    <item msgid="3244151088673185428">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>后启动。"</item>
 -    <item msgid="3663661342600168814">"已将此闹钟设置为从现在起 <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>后启动。"</item>
 -    <item msgid="7779544127785487304">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>后启动。"</item>
 +    <item msgid="7110525731259629055">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g>后提醒。"</item>
 +    <item msgid="7003982794086186185">"已将此闹钟设置为从现在起 <xliff:g id="HOURS">%2$s</xliff:g>后提醒。"</item>
 +    <item msgid="7311021123230077742">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g>后提醒。"</item>
 +    <item msgid="8431715191823114872">"已将此闹钟设置为从现在起 <xliff:g id="MINUTES">%3$s</xliff:g>后提醒。"</item>
 +    <item msgid="3244151088673185428">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>后提醒。"</item>
 +    <item msgid="3663661342600168814">"已将此闹钟设置为从现在起 <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>后提醒。"</item>
 +    <item msgid="7779544127785487304">"已将该闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>后提醒。"</item>
    </string-array>
      <string name="day" msgid="7984755014526510295">"1 天"</string>
      <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> 天"</string>
@@@ -56,9 -56,9 +55,9 @@@
      <string name="clock_instructions" msgid="3118560284915857690">"选择要显示的时钟。"</string>
      <string name="analog_gadget" msgid="1670505720837152766">"模拟时钟"</string>
      <string name="settings" msgid="5849739030579520686">"设置"</string>
 -    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"静音模式下的闹钟"</string>
 -    <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"手机处于静音模式时,闹钟仍会响"</string>
 -    <string name="snooze_duration_title" msgid="1471249885139952670">"æ\9a\82å\81\9cæ\97¶é\97´"</string>
 +    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"在静音模式下提醒"</string>
 +    <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"当手机处于静音模式时,同样进行提醒"</string>
 +    <string name="snooze_duration_title" msgid="1471249885139952670">"æ\9a\82å\81\9cæ\97¶é\95¿"</string>
    <string-array name="snooze_duration_entries">
      <item msgid="8337408933053603125">"5 分钟"</item>
      <item msgid="5294206441496024610">"10 分钟"</item>
@@@ -82,9 -82,9 +81,9 @@@
      <string name="silent_alarm_summary" msgid="8605302849408279221">"静音"</string>
      <string name="alarm_notify_text" msgid="4146350965933990093">"选择暂停或关闭此闹钟。"</string>
      <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g>(已暂停)"</string>
 -    <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>
 +    <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>
    <string-array name="volume_button_setting_entries">
      <item msgid="4520420953175098625">"无"</item>
      <item msgid="7111908302622811168">"暂停"</item>
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <string name="alarm_button_description" msgid="740283647046258651">"闹钟"</string>
 -    <string name="gallery_button_description" msgid="1151743663255257668">"图库"</string>
 -    <string name="music_button_description" msgid="1626593420810117999">"音乐"</string>
 -    <string name="nightmode_button_description" msgid="990894208217576381">"调暗"</string>
 -    <string name="home_button_description" msgid="3383859096809056157">"启动程序"</string>
 -    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
  </resources>
  -->
  <resources xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 -    <!-- no translation found for app_label (6674495003718166674) -->
 -    <skip />
 -    <!-- no translation found for alarm_list_title (7589940465292950600) -->
 -    <skip />
 +    <string name="app_label" msgid="6642875149600019623">"鬧鐘"</string>
      <string name="add_alarm" msgid="5976616107390962899">"新增鬧鐘"</string>
      <string name="delete_alarm" msgid="3457780990646206817">"刪除鬧鐘"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"啟用鬧鐘"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"停用鬧鐘"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"刪除此鬧鐘?"</string>
      <string name="show_clock" msgid="8358759982675616915">"顯示時鐘"</string>
      <string name="hide_clock" msgid="3217727306480505694">"隱藏時鐘"</string>
      <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"貪睡"</string>
      <string name="alarm_alert_snooze_set" msgid="656470966696912087">"再貪睡 <xliff:g id="MINUTES">%d</xliff:g> 分鐘。"</string>
    <string-array name="alarm_set">
 -    <item msgid="5163476010406761625">"已將此鬧鐘設為 1 分後啟動。"</item>
 -    <item msgid="7110525731259629055">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g>後啟動。"</item>
 -    <item msgid="7003982794086186185">"已將此鬧鐘設為 <xliff:g id="HOURS">%2$s</xliff:g>後啟動。"</item>
 -    <item msgid="7311021123230077742">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g>又 <xliff:g id="HOURS">%2$s</xliff:g>後啟動。"</item>
 -    <item msgid="8431715191823114872">"已將此鬧鐘設為 <xliff:g id="MINUTES">%3$s</xliff:g>後啟動。"</item>
 -    <item msgid="3244151088673185428">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g>又 <xliff:g id="MINUTES">%3$s</xliff:g>後啟動。"</item>
 -    <item msgid="3663661342600168814">"已將此鬧鐘設為 <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>後啟動。"</item>
 -    <item msgid="7779544127785487304">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g>又 <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>後啟動。"</item>
 +    <item msgid="5163476010406761625">"已將此鬧鐘設為 1 分後啟動。"</item>
 +    <item msgid="7110525731259629055">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g> 天後啟動。"</item>
 +    <item msgid="7003982794086186185">"已將此鬧鐘設為 <xliff:g id="HOURS">%2$s</xliff:g> 小時後啟動。"</item>
 +    <item msgid="7311021123230077742">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g> 天 <xliff:g id="HOURS">%2$s</xliff:g> 小時後啟動。"</item>
 +    <item msgid="8431715191823114872">"已將此鬧鐘設為 <xliff:g id="MINUTES">%3$s</xliff:g> 分鐘後啟動。"</item>
 +    <item msgid="3244151088673185428">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g> 天又 <xliff:g id="MINUTES">%3$s</xliff:g> 分鐘後啟動。"</item>
 +    <item msgid="3663661342600168814">"已將此鬧鐘設為 <xliff:g id="HOURS">%2$s</xliff:g> 小時 <xliff:g id="MINUTES">%3$s</xliff:g> 分鐘後啟動。"</item>
 +    <item msgid="7779544127785487304">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g> 天又 <xliff:g id="HOURS">%2$s</xliff:g> 小時 <xliff:g id="MINUTES">%3$s</xliff:g> 分鐘後啟動。"</item>
    </string-array>
      <string name="day" msgid="7984755014526510295">"1 天"</string>
      <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> 天"</string>
@@@ -53,7 -55,7 +52,7 @@@
      <string name="every_day" msgid="1058994798884544691">"每天"</string>
      <string name="never" msgid="54104287800571769">"從不"</string>
      <string name="day_concat" msgid="971998564991636532">"、 "</string>
 -    <string name="clock_instructions" msgid="3118560284915857690">"選取顯示的時鐘。"</string>
 +    <string name="clock_instructions" msgid="3118560284915857690">"選取顯示的時鐘。"</string>
      <string name="analog_gadget" msgid="1670505720837152766">"類比時鐘"</string>
      <string name="settings" msgid="5849739030579520686">"設定"</string>
      <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"靜音模式下的鬧鐘"</string>
@@@ -82,7 -84,7 +81,7 @@@
      <string name="silent_alarm_summary" msgid="8605302849408279221">"靜音"</string>
      <string name="alarm_notify_text" msgid="4146350965933990093">"選取貪睡功能或關閉此鬧鐘。"</string>
      <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (貪睡)"</string>
 -    <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"鬧鐘設定在 <xliff:g id="TIME">%s</xliff:g>,選取即可取消"</string>
 +    <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>
    <string-array name="volume_button_setting_entries">
      <item msgid="3204893476515513084">"1"</item>
      <item msgid="7687709558968154577">"2"</item>
    </string-array>
 -    <!-- no translation found for alarm_button_description (740283647046258651) -->
 -    <skip />
 -    <!-- no translation found for gallery_button_description (1151743663255257668) -->
 -    <skip />
 -    <!-- no translation found for music_button_description (1626593420810117999) -->
 -    <skip />
 -    <!-- no translation found for nightmode_button_description (990894208217576381) -->
 -    <skip />
 -    <!-- no translation found for home_button_description (3383859096809056157) -->
 -    <skip />
 -    <!-- no translation found for battery_charging_level (4391767951302394083) -->
 -    <skip />
  </resources>
@@@ -28,6 -28,7 +28,6 @@@ import android.graphics.Typeface
  import android.net.Uri;
  import android.os.Bundle;
  import android.os.Handler;
 -import android.provider.Settings;
  import android.view.ContextMenu;
  import android.view.ContextMenu.ContextMenuInfo;
  import android.view.LayoutInflater;
@@@ -35,6 -36,7 +35,6 @@@ import android.view.Menu
  import android.view.MenuItem;
  import android.view.View;
  import android.view.View.OnClickListener;
 -import android.view.View.OnCreateContextMenuListener;
  import android.view.ViewGroup;
  import android.widget.AdapterView;
  import android.widget.AdapterView.AdapterContextMenuInfo;
@@@ -54,11 -56,11 +54,11 @@@ import java.util.Calendar
   */
  public class AlarmClock extends Activity implements OnItemClickListener {
  
 -    final static String PREFERENCES = "AlarmClock";
 +    static final String PREFERENCES = "AlarmClock";
  
      /** This must be false for production.  If true, turns on logging,
          test code, etc. */
 -    final static boolean DEBUG = false;
 +    static final boolean DEBUG = false;
  
      private SharedPreferences mPrefs;
      private LayoutInflater mFactory;
@@@ -84,9 -86,9 +84,9 @@@
          public View newView(Context context, Cursor cursor, ViewGroup parent) {
              View ret = mFactory.inflate(R.layout.alarm_time, parent, false);
  
 -            DigitalClock digitalClock = (DigitalClock)ret.findViewById(R.id.digitalClock);
 +            DigitalClock digitalClock =
 +                    (DigitalClock) ret.findViewById(R.id.digitalClock);
              digitalClock.setLive(false);
 -            if (Log.LOGV) Log.v("newView " + cursor.getPosition());
              return ret;
          }
  
                  }
                  return true;
  
+             case R.id.edit_alarm:
+                 Intent intent = new Intent(this, SetAlarm.class);
+                 intent.putExtra(Alarms.ALARM_ID, id);
+                 startActivity(intent);
+                 return true;
              default:
                  break;
          }
          View addAlarm = findViewById(R.id.add_alarm);
          addAlarm.setOnClickListener(new View.OnClickListener() {
                  public void onClick(View v) {
-                     Uri uri = Alarms.addAlarm(getContentResolver());
-                     // FIXME: scroll to new item?
-                     String segment = uri.getPathSegments().get(1);
-                     int newId = Integer.parseInt(segment);
-                     if (Log.LOGV) {
-                         Log.v("In AlarmClock, new alarm id = " + newId);
-                     }
-                     Intent intent =
-                         new Intent(AlarmClock.this, SetAlarm.class);
-                     intent.putExtra(Alarms.ALARM_ID, newId);
-                     startActivity(intent);
+                     addNewAlarm();
                  }
              });
  
          });
      }
  
+     private void addNewAlarm() {
+         Uri uri = Alarms.addAlarm(getContentResolver());
+         String segment = uri.getPathSegments().get(1);
+         int newId = Integer.parseInt(segment);
+         if (Log.LOGV) {
+             Log.v("In AlarmClock, new alarm id = " + newId);
+         }
+         Intent intent = new Intent(this, SetAlarm.class);
+         intent.putExtra(Alarms.ALARM_ID, newId);
+         startActivity(intent);
+     }
      @Override
      protected void onDestroy() {
          super.onDestroy();
  
          // Set the custom view on the menu.
          menu.setHeaderView(v);
-         // Change the text to "disable" if the alarm is already enabled.
-         if (alarm.enabled) {
-             menu.findItem(R.id.enable_alarm).setTitle(R.string.disable_alarm);
-         }
      }
  
      @Override
      public boolean onOptionsItemSelected(MenuItem item) {
-         if (item.getItemId() == R.id.menu_item_settings) {
-             startActivity(new Intent(this, SettingsActivity.class));
-             return true;
+         switch (item.getItemId()) {
+             case R.id.menu_item_settings:
+                 startActivity(new Intent(this, SettingsActivity.class));
+                 return true;
+             case R.id.menu_item_desk_clock:
+                 startActivity(new Intent(this, DeskClock.class));
+                 return true;
+             case R.id.menu_item_add_alarm:
+                 addNewAlarm();
+                 return true;
+             default:
+                 break;
          }
-         return false;
+         return super.onOptionsItemSelected(item);
      }
  
      @Override
      public boolean onCreateOptionsMenu(Menu menu) {
          getMenuInflater().inflate(R.menu.alarm_list_menu, menu);
-         return true;
+         return super.onCreateOptionsMenu(menu);
      }
  
      public void onItemClick(AdapterView parent, View v, int pos, long id) {