Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

packages-apps-AlarmClock: Commit

packages/apps/AlarmClock


Commit MetaInfo

Revision310692b59f080be04d9e8ec51d690d7b4a680ae4 (tree)
Time2010-01-13 08:19:07
AuthorThe Android Open Source Project <initial-contribution@andr...>
CommiterThe Android Open Source Project

Log Message

android-2.1_r1 snapshot

Change Summary

Incremental Difference

--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -78,12 +78,12 @@
7878 <string name="done" msgid="6509722361933858451">"Hotovo"</string>
7979 <string name="revert" msgid="9100911171235162926">"Vrátit zpět"</string>
8080 <string name="alarm_volume_title" msgid="8506245173912428522">"Hlasitost budíku"</string>
81- <string name="alarm_volume_summary" msgid="8957440373896242438">"Nastavit hlasitost budíků"</string>
81+ <string name="alarm_volume_summary" msgid="8957440373896242438">"Nastavení hlasitosti budíků"</string>
8282 <string name="silent_alarm_summary" msgid="8605302849408279221">"Tichý"</string>
8383 <string name="alarm_notify_text" msgid="4146350965933990093">"Vyberte, zda budík chcete ukončit nebo odložit."</string>
8484 <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (odloženo)"</string>
8585 <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>
86- <string name="volume_button_setting_title" msgid="1892885285888644234">"Chování postranního tlačítka"</string>
86+ <string name="volume_button_setting_title" msgid="1892885285888644234">"Chování postranních tlačítek"</string>
8787 <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>
8888 <string-array name="volume_button_setting_entries">
8989 <item msgid="4520420953175098625">"Žádné"</item>
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -25,13 +25,13 @@
2525 <string name="hide_clock" msgid="3217727306480505694">"Skjul ur"</string>
2626 <string name="label" msgid="162189613902857319">"Etiket"</string>
2727 <string name="default_label" msgid="5590025289805630372">"Alarm"</string>
28- <string name="set_alarm" msgid="9148359866152726808">"Indstil alarm"</string>
29- <string name="alarm_vibrate" msgid="3476686921490362230">"Vibrer"</string>
28+ <string name="set_alarm" msgid="9148359866152726808">"Angiv alarm"</string>
29+ <string name="alarm_vibrate" msgid="3476686921490362230">"Vibration"</string>
3030 <string name="alarm_repeat" msgid="7242985466344233206">"Gentag"</string>
3131 <string name="alert" msgid="6539852766423700221">"Ringetone"</string>
3232 <string name="time" msgid="8067216534232296518">"Tid"</string>
3333 <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Annuller"</string>
34- <string name="alarm_alert_alert_silenced" msgid="7918075929961104202">"Alarm dæmpes efter <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
34+ <string name="alarm_alert_alert_silenced" msgid="7918075929961104202">"Alarm slukkes efter <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
3535 <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Slumretilstand"</string>
3636 <string name="alarm_alert_snooze_set" msgid="656470966696912087">"Slumrer i <xliff:g id="MINUTES">%d</xliff:g> minutter."</string>
3737 <string-array name="alarm_set">
@@ -50,13 +50,13 @@
5050 <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> timer"</string>
5151 <string name="minute" msgid="2486157997434653710">"1 minut"</string>
5252 <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutter"</string>
53- <string name="every_day" msgid="1058994798884544691">"Hver dag"</string>
53+ <string name="every_day" msgid="1058994798884544691">"hver dag"</string>
5454 <string name="never" msgid="54104287800571769">"Aldrig"</string>
5555 <string name="day_concat" msgid="971998564991636532">", "</string>
56- <string name="clock_instructions" msgid="3118560284915857690">"Vælg et ur, der skal vises."</string>
56+ <string name="clock_instructions" msgid="3118560284915857690">"Vælg det ur, der skal vises."</string>
5757 <string name="analog_gadget" msgid="1670505720837152766">"Analogt ur"</string>
5858 <string name="settings" msgid="5849739030579520686">"Indstillinger"</string>
59- <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarm er i lydløs tilstand"</string>
59+ <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarm i lydløs tilstand"</string>
6060 <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"Afspil alarm, selvom telefonen er i lydløs tilstand"</string>
6161 <string name="snooze_duration_title" msgid="1471249885139952670">"Slumretilstands varighed"</string>
6262 <string-array name="snooze_duration_entries">
@@ -75,16 +75,16 @@
7575 <item msgid="6048861883552402852">"25"</item>
7676 <item msgid="2740866721232379791">"30"</item>
7777 </string-array>
78- <string name="done" msgid="6509722361933858451">"Færdig"</string>
79- <string name="revert" msgid="9100911171235162926">"Vend tilbage"</string>
80- <string name="alarm_volume_title" msgid="8506245173912428522">"Alarmlydstyrke"</string>
81- <string name="alarm_volume_summary" msgid="8957440373896242438">"Indstil alarmernes lydstyrke"</string>
78+ <string name="done" msgid="6509722361933858451">"Udfør"</string>
79+ <string name="revert" msgid="9100911171235162926">"Annuller"</string>
80+ <string name="alarm_volume_title" msgid="8506245173912428522">"Lydstyrke for alarm"</string>
81+ <string name="alarm_volume_summary" msgid="8957440373896242438">"Angiv alarmernes lydstyrke"</string>
8282 <string name="silent_alarm_summary" msgid="8605302849408279221">"Lydløs"</string>
8383 <string name="alarm_notify_text" msgid="4146350965933990093">"Vælg for at slumre eller annullere alarmen."</string>
8484 <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (slumretilstand)"</string>
8585 <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>
8686 <string name="volume_button_setting_title" msgid="1892885285888644234">"Sideknaps adfærd"</string>
87- <string name="volume_button_setting_summary" msgid="1594641247799573198">"Indstil ønsket adfærd for sideknappen, når der trykkes på den under en alarm"</string>
87+ <string name="volume_button_setting_summary" msgid="1594641247799573198">"Angiv ønsket adfærd for sideknapperne, når der trykkes på dem under en alarm"</string>
8888 <string-array name="volume_button_setting_entries">
8989 <item msgid="4520420953175098625">"Ingen"</item>
9090 <item msgid="7111908302622811168">"Slumretilstand"</item>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -80,15 +80,15 @@
8080 <string name="alarm_volume_title" msgid="8506245173912428522">"Lautstärke für Alarm"</string>
8181 <string name="alarm_volume_summary" msgid="8957440373896242438">"Lautstärke des Weckers einstellen"</string>
8282 <string name="silent_alarm_summary" msgid="8605302849408279221">"Lautlos"</string>
83- <string name="alarm_notify_text" msgid="4146350965933990093">"Für Snooze-Funktion oder Ablehnen der Weckerfunktion auswählen"</string>
83+ <string name="alarm_notify_text" msgid="4146350965933990093">"Für Snooze-Funktion oder Beenden auswählen"</string>
8484 <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (Snooze)"</string>
8585 <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Wecker für <xliff:g id="TIME">%s</xliff:g> gestellt. Zum Abbrechen auswählen."</string>
86- <string name="volume_button_setting_title" msgid="1892885285888644234">"Verhalten der seitlichen Schaltfläche"</string>
87- <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>
86+ <string name="volume_button_setting_title" msgid="1892885285888644234">"Funktion der seitlichen Tasten"</string>
87+ <string name="volume_button_setting_summary" msgid="1594641247799573198">"Verhalten der seitlichen Tasten während des Weckerklingelns"</string>
8888 <string-array name="volume_button_setting_entries">
8989 <item msgid="4520420953175098625">"Keine"</item>
9090 <item msgid="7111908302622811168">"Snooze-Funktion"</item>
91- <item msgid="8573552194573068996">"Verwerfen"</item>
91+ <item msgid="8573552194573068996">"Beenden"</item>
9292 </string-array>
9393 <string-array name="volume_button_setting_values">
9494 <item msgid="4851033050639608752">"0"</item>
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -78,7 +78,7 @@
7878 <string name="done" msgid="6509722361933858451">"Τέλος"</string>
7979 <string name="revert" msgid="9100911171235162926">"Επαναφορά"</string>
8080 <string name="alarm_volume_title" msgid="8506245173912428522">"Ένταση ήχου ξυπνητηριού"</string>
81- <string name="alarm_volume_summary" msgid="8957440373896242438">"Ορισμός του αριθμού των ειδοποιήσεων"</string>
81+ <string name="alarm_volume_summary" msgid="8957440373896242438">"Ορισμός της έντασης του ήχου ξυπνητηριού"</string>
8282 <string name="silent_alarm_summary" msgid="8605302849408279221">"Σίγαση"</string>
8383 <string name="alarm_notify_text" msgid="4146350965933990093">"Επιλέξτε την αφύπνιση ή την παράβλεψη σε αυτό το ξυπνητήρι."</string>
8484 <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (αναβολή)"</string>
@@ -86,7 +86,7 @@
8686 <string name="volume_button_setting_title" msgid="1892885285888644234">"Συμπεριφορά πλευρικού κουμπιού"</string>
8787 <string name="volume_button_setting_summary" msgid="1594641247799573198">"Ορίστε την επιθυμητή συμπεριφορά των πλαϊνών κουμπιών κατά τον ήχο του ξυπνητηριού"</string>
8888 <string-array name="volume_button_setting_entries">
89- <item msgid="4520420953175098625">"Κανένα"</item>
89+ <item msgid="4520420953175098625">"Καμία"</item>
9090 <item msgid="7111908302622811168">"Αφύπνιση"</item>
9191 <item msgid="8573552194573068996">"Παράβλεψη"</item>
9292 </string-array>
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -55,8 +55,8 @@
5555 <string name="day_concat" msgid="971998564991636532">", "</string>
5656 <string name="clock_instructions" msgid="3118560284915857690">"Selecciona un reloj."</string>
5757 <string name="analog_gadget" msgid="1670505720837152766">"Reloj analógico"</string>
58- <string name="settings" msgid="5849739030579520686">"Configuración"</string>
59- <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarma en modo silencioso"</string>
58+ <string name="settings" msgid="5849739030579520686">"Config."</string>
59+ <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarma en modo silencio"</string>
6060 <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"Reproducir alarma cuando el teléfono está en modo silencioso"</string>
6161 <string name="snooze_duration_title" msgid="1471249885139952670">"Duración de recurrencia"</string>
6262 <string-array name="snooze_duration_entries">
@@ -83,8 +83,8 @@
8383 <string name="alarm_notify_text" msgid="4146350965933990093">"Seleccionar alarma recurrente o rechazar."</string>
8484 <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (recurrente)"</string>
8585 <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Esta alarma se activará en <xliff:g id="TIME">%s</xliff:g>. Selecciona para cancelar."</string>
86- <string name="volume_button_setting_title" msgid="1892885285888644234">"Comportamiento del botón lateral"</string>
87- <string name="volume_button_setting_summary" msgid="1594641247799573198">"Activar el comportamiento deseado de los botones laterales cuando se presionen durante una alarma"</string>
86+ <string name="volume_button_setting_title" msgid="1892885285888644234">"Comport. del botón lateral"</string>
87+ <string name="volume_button_setting_summary" msgid="1594641247799573198">"Activar el comport. deseado de los botones lat. durante una alarma"</string>
8888 <string-array name="volume_button_setting_entries">
8989 <item msgid="4520420953175098625">"Ninguno"</item>
9090 <item msgid="7111908302622811168">"Recurrente"</item>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -58,7 +58,7 @@
5858 <string name="settings" msgid="5849739030579520686">"Configuración"</string>
5959 <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarma en modo silencio"</string>
6060 <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"Reproducir alarma aunque el teléfono esté en modo silencio"</string>
61- <string name="snooze_duration_title" msgid="1471249885139952670">"Duración de la posposición"</string>
61+ <string name="snooze_duration_title" msgid="1471249885139952670">"Repetición de alarmas"</string>
6262 <string-array name="snooze_duration_entries">
6363 <item msgid="8337408933053603125">"5 minutos"</item>
6464 <item msgid="5294206441496024610">"10 minutos"</item>
@@ -80,10 +80,10 @@
8080 <string name="alarm_volume_title" msgid="8506245173912428522">"Volumen de alarma"</string>
8181 <string name="alarm_volume_summary" msgid="8957440373896242438">"Establecer el volumen de las alarmas"</string>
8282 <string name="silent_alarm_summary" msgid="8605302849408279221">"Silencio"</string>
83- <string name="alarm_notify_text" msgid="4146350965933990093">"Elija si desea posponer o descartar esta alarma."</string>
83+ <string name="alarm_notify_text" msgid="4146350965933990093">"Elige si deseas posponer o descartar esta alarma."</string>
8484 <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (pospuesta)"</string>
85- <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>
86- <string name="volume_button_setting_title" msgid="1892885285888644234">"Comportamiento de botón lateral"</string>
85+ <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>
86+ <string name="volume_button_setting_title" msgid="1892885285888644234">"Comportamiento de los botones laterales"</string>
8787 <string name="volume_button_setting_summary" msgid="1594641247799573198">"Establecer el comportamiento deseado de los botones laterales cuando se pulsan durante una alarma"</string>
8888 <string-array name="volume_button_setting_entries">
8989 <item msgid="4520420953175098625">"Ninguno"</item>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -17,7 +17,7 @@
1717 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
1818 <string name="app_label" msgid="6642875149600019623">"Réveil"</string>
1919 <string name="add_alarm" msgid="5976616107390962899">"Ajouter alarme"</string>
20- <string name="delete_alarm" msgid="3457780990646206817">"Désactiver l\'alarme"</string>
20+ <string name="delete_alarm" msgid="3457780990646206817">"Supprimer l\'alarme"</string>
2121 <string name="enable_alarm" msgid="7442658245797418741">"Activer l\'alarme"</string>
2222 <string name="disable_alarm" msgid="6665528499886549648">"Désactiver l\'alarme"</string>
2323 <string name="delete_alarm_confirm" msgid="4237696873219106907">"Cette alarme va être supprimée."</string>
@@ -57,7 +57,7 @@
5757 <string name="analog_gadget" msgid="1670505720837152766">"Horloge analogique"</string>
5858 <string name="settings" msgid="5849739030579520686">"Paramètres"</string>
5959 <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarme mode silencieux"</string>
60- <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"Faire sonner l\'alarme même lorsque le téléphone est en mode silencieux."</string>
60+ <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"Faire sonner l\'alarme même lorsque le téléphone est en mode silencieux"</string>
6161 <string name="snooze_duration_title" msgid="1471249885139952670">"Répéter après"</string>
6262 <string-array name="snooze_duration_entries">
6363 <item msgid="8337408933053603125">"5 minutes"</item>
@@ -84,7 +84,7 @@
8484 <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (répétition)"</string>
8585 <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>
8686 <string name="volume_button_setting_title" msgid="1892885285888644234">"Action du bouton latéral"</string>
87- <string name="volume_button_setting_summary" msgid="1594641247799573198">"Définissez les actions effectuées par les boutons latéraux lors d\'une alarme."</string>
87+ <string name="volume_button_setting_summary" msgid="1594641247799573198">"Définir les actions des boutons latéraux lors d\'une alarme"</string>
8888 <string-array name="volume_button_setting_entries">
8989 <item msgid="4520420953175098625">"Aucune"</item>
9090 <item msgid="7111908302622811168">"Répéter"</item>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -56,7 +56,7 @@
5656 <string name="clock_instructions" msgid="3118560284915857690">"Seleziona un orologio."</string>
5757 <string name="analog_gadget" msgid="1670505720837152766">"Orologio analogico"</string>
5858 <string name="settings" msgid="5849739030579520686">"Impostazioni"</string>
59- <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Allarme in mod. silenziosa"</string>
59+ <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Allarme in mod. silenz."</string>
6060 <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"Riproduci allarme anche con telefono in modalità silenziosa"</string>
6161 <string name="snooze_duration_title" msgid="1471249885139952670">"Durata sospensione"</string>
6262 <string-array name="snooze_duration_entries">
@@ -83,8 +83,8 @@
8383 <string name="alarm_notify_text" msgid="4146350965933990093">"Seleziona per sospendere o eliminare questo allarme."</string>
8484 <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (sospeso)"</string>
8585 <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"L\'allarme sarà attivato alle <xliff:g id="TIME">%s</xliff:g>. Seleziona per annullare."</string>
86- <string name="volume_button_setting_title" msgid="1892885285888644234">"Comportamento pulsante laterale"</string>
87- <string name="volume_button_setting_summary" msgid="1594641247799573198">"Imposta il comportamento desiderato dei pulsanti laterali quando vengono premuti durante un allarme"</string>
86+ <string name="volume_button_setting_title" msgid="1892885285888644234">"Comp. pulsante laterale"</string>
87+ <string name="volume_button_setting_summary" msgid="1594641247799573198">"Imposta il comport. dei puls. laterali quando vengono premuti durante un allarme"</string>
8888 <string-array name="volume_button_setting_entries">
8989 <item msgid="4520420953175098625">"Nessuno"</item>
9090 <item msgid="7111908302622811168">"Sospendi"</item>
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -36,13 +36,13 @@
3636 <string name="alarm_alert_snooze_set" msgid="656470966696912087">"<xliff:g id="MINUTES">%d</xliff:g>分後に再通知します"</string>
3737 <string-array name="alarm_set">
3838 <item msgid="5163476010406761625">"アラームは今から1分以内に設定されています。"</item>
39- <item msgid="7110525731259629055">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>日後に設定されています。"</item>
40- <item msgid="7003982794086186185">"アラームは<xliff:g id="HOURS">%2$s</xliff:g>時間後に設定されています。"</item>
41- <item msgid="7311021123230077742">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>日と<xliff:g id="HOURS">%2$s</xliff:g>時間後に設定されています。"</item>
42- <item msgid="8431715191823114872">"アラームは<xliff:g id="MINUTES">%3$s</xliff:g>分後に設定されています。"</item>
43- <item msgid="3244151088673185428">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>日と<xliff:g id="MINUTES">%3$s</xliff:g>分後に設定されています。"</item>
44- <item msgid="3663661342600168814">"アラームは<xliff:g id="HOURS">%2$s</xliff:g>時間<xliff:g id="MINUTES">%3$s</xliff:g>分後に設定されています。"</item>
45- <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>
39+ <item msgid="7110525731259629055">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>後に設定されています。"</item>
40+ <item msgid="7003982794086186185">"アラームは<xliff:g id="HOURS">%2$s</xliff:g>後に設定されています。"</item>
41+ <item msgid="7311021123230077742">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>と<xliff:g id="HOURS">%2$s</xliff:g>後に設定されています。"</item>
42+ <item msgid="8431715191823114872">"アラームは<xliff:g id="MINUTES">%3$s</xliff:g>後に設定されています。"</item>
43+ <item msgid="3244151088673185428">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>と<xliff:g id="MINUTES">%3$s</xliff:g>後に設定されています。"</item>
44+ <item msgid="3663661342600168814">"アラームは<xliff:g id="HOURS">%2$s</xliff:g><xliff:g id="MINUTES">%3$s</xliff:g>後に設定されています。"</item>
45+ <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>
4646 </string-array>
4747 <string name="day" msgid="7984755014526510295">"1日"</string>
4848 <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g>日"</string>
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -78,7 +78,7 @@
7878 <string name="done" msgid="6509722361933858451">"Gereed"</string>
7979 <string name="revert" msgid="9100911171235162926">"Terugzetten"</string>
8080 <string name="alarm_volume_title" msgid="8506245173912428522">"Alarmvolume"</string>
81- <string name="alarm_volume_summary" msgid="8957440373896242438">"Het volume van alarmen instellen"</string>
81+ <string name="alarm_volume_summary" msgid="8957440373896242438">"Het volume van het alarm instellen"</string>
8282 <string name="silent_alarm_summary" msgid="8605302849408279221">"Stil"</string>
8383 <string name="alarm_notify_text" msgid="4146350965933990093">"Selecteer of u snooze wilt selecteren voor dit alarm of het alarm wilt negeren."</string>
8484 <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (snooze aan)"</string>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -26,7 +26,7 @@
2626 <string name="label" msgid="162189613902857319">"Ярлык"</string>
2727 <string name="default_label" msgid="5590025289805630372">"Будильник"</string>
2828 <string name="set_alarm" msgid="9148359866152726808">"Установить будильник"</string>
29- <string name="alarm_vibrate" msgid="3476686921490362230">"Вибрация"</string>
29+ <string name="alarm_vibrate" msgid="3476686921490362230">"Вибросигнал"</string>
3030 <string name="alarm_repeat" msgid="7242985466344233206">"Повтор"</string>
3131 <string name="alert" msgid="6539852766423700221">"Мелодия"</string>
3232 <string name="time" msgid="8067216534232296518">"Время"</string>
@@ -76,7 +76,7 @@
7676 <item msgid="2740866721232379791">"30"</item>
7777 </string-array>
7878 <string name="done" msgid="6509722361933858451">"Готово"</string>
79- <string name="revert" msgid="9100911171235162926">"Отменить изменения"</string>
79+ <string name="revert" msgid="9100911171235162926">"Отмена"</string>
8080 <string name="alarm_volume_title" msgid="8506245173912428522">"Громкость будильника"</string>
8181 <string name="alarm_volume_summary" msgid="8957440373896242438">"Настройка громкости будильника"</string>
8282 <string name="silent_alarm_summary" msgid="8605302849408279221">"Без звука"</string>
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -84,9 +84,9 @@
8484 <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (snoozat)"</string>
8585 <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Alarmet ringer <xliff:g id="TIME">%s</xliff:g>. Välj om du vill avbryta."</string>
8686 <string name="volume_button_setting_title" msgid="1892885285888644234">"Sidoknappens funktion"</string>
87- <string name="volume_button_setting_summary" msgid="1594641247799573198">"Ange önskad funktion för sidoknapparna om de används under ett alarm"</string>
87+ <string name="volume_button_setting_summary" msgid="1594641247799573198">"Ange önskad funktion för sidoknappen under alarm"</string>
8888 <string-array name="volume_button_setting_entries">
89- <item msgid="4520420953175098625">"Inga"</item>
89+ <item msgid="4520420953175098625">"Ingen"</item>
9090 <item msgid="7111908302622811168">"Snooze"</item>
9191 <item msgid="8573552194573068996">"Ta bort permanent"</item>
9292 </string-array>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -84,7 +84,7 @@
8484 <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (ertelendi)"</string>
8585 <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>
8686 <string name="volume_button_setting_title" msgid="1892885285888644234">"Yan düğme işlevi"</string>
87- <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>
87+ <string name="volume_button_setting_summary" msgid="1594641247799573198">"Alarm sırasında basıldığında istenen yan düğme işlevini ayarlayın"</string>
8888 <string-array name="volume_button_setting_entries">
8989 <item msgid="4520420953175098625">"Yok"</item>
9090 <item msgid="7111908302622811168">"Ertele"</item>
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -30,19 +30,19 @@
3030 <string name="alarm_repeat" msgid="7242985466344233206">"重复"</string>
3131 <string name="alert" msgid="6539852766423700221">"铃声"</string>
3232 <string name="time" msgid="8067216534232296518">"时间"</string>
33- <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"关闭"</string>
34- <string name="alarm_alert_alert_silenced" msgid="7918075929961104202">"闹钟提示已过 <xliff:g id="MINUTES">%d</xliff:g> 分钟"</string>
35- <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"暂停"</string>
36- <string name="alarm_alert_snooze_set" msgid="656470966696912087">"暂停 <xliff:g id="MINUTES">%d</xliff:g> 分钟。"</string>
33+ <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"取消"</string>
34+ <string name="alarm_alert_alert_silenced" msgid="7918075929961104202">"闹钟响了 <xliff:g id="MINUTES">%d</xliff:g> 分钟后停止"</string>
35+ <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"暂停再响"</string>
36+ <string name="alarm_alert_snooze_set" msgid="656470966696912087">"暂停 <xliff:g id="MINUTES">%d</xliff:g> 分钟后再响。"</string>
3737 <string-array name="alarm_set">
3838 <item msgid="5163476010406761625">"已将此闹钟设置为从现在起不到 1 分钟后提醒。"</item>
39- <item msgid="7110525731259629055">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g>后提醒。"</item>
40- <item msgid="7003982794086186185">"已将此闹钟设置为从现在起 <xliff:g id="HOURS">%2$s</xliff:g>后提醒。"</item>
41- <item msgid="7311021123230077742">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g>后提醒。"</item>
42- <item msgid="8431715191823114872">"已将此闹钟设置为从现在起 <xliff:g id="MINUTES">%3$s</xliff:g>后提醒。"</item>
43- <item msgid="3244151088673185428">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>后提醒。"</item>
44- <item msgid="3663661342600168814">"已将此闹钟设置为从现在起 <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>后提醒。"</item>
45- <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>
39+ <item msgid="7110525731259629055">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g>后启动。"</item>
40+ <item msgid="7003982794086186185">"已将此闹钟设置为从现在起 <xliff:g id="HOURS">%2$s</xliff:g>后启动。"</item>
41+ <item msgid="7311021123230077742">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g>后启动。"</item>
42+ <item msgid="8431715191823114872">"已将此闹钟设置为从现在起 <xliff:g id="MINUTES">%3$s</xliff:g>后启动。"</item>
43+ <item msgid="3244151088673185428">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>后启动。"</item>
44+ <item msgid="3663661342600168814">"已将此闹钟设置为从现在起 <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>后启动。"</item>
45+ <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>
4646 </string-array>
4747 <string name="day" msgid="7984755014526510295">"1 天"</string>
4848 <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> 天"</string>
@@ -56,9 +56,9 @@
5656 <string name="clock_instructions" msgid="3118560284915857690">"选择要显示的时钟。"</string>
5757 <string name="analog_gadget" msgid="1670505720837152766">"模拟时钟"</string>
5858 <string name="settings" msgid="5849739030579520686">"设置"</string>
59- <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"在静音模式下提醒"</string>
60- <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"当手机处于静音模式时,同样进行提醒"</string>
61- <string name="snooze_duration_title" msgid="1471249885139952670">"暂停时长"</string>
59+ <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"静音模式下闹钟响"</string>
60+ <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"手机处于静音模式时,闹钟仍会响"</string>
61+ <string name="snooze_duration_title" msgid="1471249885139952670">"再响间隔"</string>
6262 <string-array name="snooze_duration_entries">
6363 <item msgid="8337408933053603125">"5 分钟"</item>
6464 <item msgid="5294206441496024610">"10 分钟"</item>
@@ -82,9 +82,9 @@
8282 <string name="silent_alarm_summary" msgid="8605302849408279221">"静音"</string>
8383 <string name="alarm_notify_text" msgid="4146350965933990093">"选择暂停或关闭此闹钟。"</string>
8484 <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g>(已暂停)"</string>
85- <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"已将闹钟设置为从现在起 <xliff:g id="TIME">%s</xliff:g>后再提醒。选中可以取消。"</string>
86- <string name="volume_button_setting_title" msgid="1892885285888644234">"侧按钮行为"</string>
87- <string name="volume_button_setting_summary" msgid="1594641247799573198">"根据需要设置闹钟响时按侧按钮所期望出现的行为"</string>
85+ <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"已将此闹钟设置在 <xliff:g id="TIME">%s</xliff:g>启动。选择即可取消。"</string>
86+ <string name="volume_button_setting_title" msgid="1892885285888644234">"侧边按钮功用"</string>
87+ <string name="volume_button_setting_summary" msgid="1594641247799573198">"设置侧边按钮在闹钟启动时的功用"</string>
8888 <string-array name="volume_button_setting_entries">
8989 <item msgid="4520420953175098625">"无"</item>
9090 <item msgid="7111908302622811168">"暂停"</item>
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -35,14 +35,14 @@
3535 <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"貪睡"</string>
3636 <string name="alarm_alert_snooze_set" msgid="656470966696912087">"再貪睡 <xliff:g id="MINUTES">%d</xliff:g> 分鐘。"</string>
3737 <string-array name="alarm_set">
38- <item msgid="5163476010406761625">"已將此鬧鐘設為 1 分種後啟動。"</item>
39- <item msgid="7110525731259629055">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g> 天後啟動。"</item>
40- <item msgid="7003982794086186185">"已將此鬧鐘設為 <xliff:g id="HOURS">%2$s</xliff:g> 小時後啟動。"</item>
41- <item msgid="7311021123230077742">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g> 天 <xliff:g id="HOURS">%2$s</xliff:g> 小時後啟動。"</item>
42- <item msgid="8431715191823114872">"已將此鬧鐘設為 <xliff:g id="MINUTES">%3$s</xliff:g> 分鐘後啟動。"</item>
43- <item msgid="3244151088673185428">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g> 天又 <xliff:g id="MINUTES">%3$s</xliff:g> 分鐘後啟動。"</item>
44- <item msgid="3663661342600168814">"已將此鬧鐘設為 <xliff:g id="HOURS">%2$s</xliff:g> 小時 <xliff:g id="MINUTES">%3$s</xliff:g> 分鐘後啟動。"</item>
45- <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>
38+ <item msgid="5163476010406761625">"已將此鬧鐘設為 1 分鐘後啟動。"</item>
39+ <item msgid="7110525731259629055">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g>後啟動。"</item>
40+ <item msgid="7003982794086186185">"已將此鬧鐘設為 <xliff:g id="HOURS">%2$s</xliff:g>後啟動。"</item>
41+ <item msgid="7311021123230077742">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g>又 <xliff:g id="HOURS">%2$s</xliff:g>後啟動。"</item>
42+ <item msgid="8431715191823114872">"已將此鬧鐘設為 <xliff:g id="MINUTES">%3$s</xliff:g>後啟動。"</item>
43+ <item msgid="3244151088673185428">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g>又 <xliff:g id="MINUTES">%3$s</xliff:g>後啟動。"</item>
44+ <item msgid="3663661342600168814">"已將此鬧鐘設為 <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>後啟動。"</item>
45+ <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>
4646 </string-array>
4747 <string name="day" msgid="7984755014526510295">"1 天"</string>
4848 <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> 天"</string>
@@ -53,7 +53,7 @@
5353 <string name="every_day" msgid="1058994798884544691">"每天"</string>
5454 <string name="never" msgid="54104287800571769">"從不"</string>
5555 <string name="day_concat" msgid="971998564991636532">"、 "</string>
56- <string name="clock_instructions" msgid="3118560284915857690">"選取顯示的時鐘。"</string>
56+ <string name="clock_instructions" msgid="3118560284915857690">"選取要顯示的時鐘。"</string>
5757 <string name="analog_gadget" msgid="1670505720837152766">"類比時鐘"</string>
5858 <string name="settings" msgid="5849739030579520686">"設定"</string>
5959 <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"靜音模式下的鬧鐘"</string>
@@ -82,7 +82,7 @@
8282 <string name="silent_alarm_summary" msgid="8605302849408279221">"靜音"</string>
8383 <string name="alarm_notify_text" msgid="4146350965933990093">"選取貪睡功能或關閉此鬧鐘。"</string>
8484 <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (貪睡)"</string>
85- <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"已將鬧鐘設定在 <xliff:g id="TIME">%s</xliff:g>,選取即可取消。"</string>
85+ <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"鬧鐘設定在 <xliff:g id="TIME">%s</xliff:g>,選取即可取消"</string>
8686 <string name="volume_button_setting_title" msgid="1892885285888644234">"側邊按鈕功用"</string>
8787 <string name="volume_button_setting_summary" msgid="1594641247799573198">"設定側邊按鈕在鬧鐘啟動時的功用"</string>
8888 <string-array name="volume_button_setting_entries">
--- a/src/com/android/alarmclock/AlarmKlaxon.java
+++ b/src/com/android/alarmclock/AlarmKlaxon.java
@@ -229,10 +229,15 @@ public class AlarmKlaxon extends Service {
229229 private void startAlarm(MediaPlayer player)
230230 throws java.io.IOException, IllegalArgumentException,
231231 IllegalStateException {
232- player.setAudioStreamType(AudioManager.STREAM_ALARM);
233- player.setLooping(true);
234- player.prepare();
235- player.start();
232+ final AudioManager audioManager = (AudioManager)getSystemService(Context.AUDIO_SERVICE);
233+ // do not play alarms if stream volume is 0
234+ // (typically because ringer mode is silent).
235+ if (audioManager.getStreamVolume(AudioManager.STREAM_ALARM) != 0) {
236+ player.setAudioStreamType(AudioManager.STREAM_ALARM);
237+ player.setLooping(true);
238+ player.prepare();
239+ player.start();
240+ }
236241 }
237242
238243 private void setDataSourceFromResource(Resources resources,
Show on old repository browser