android-2.1_r1 snapshot
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 2e50d17..eeb2303 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -78,12 +78,12 @@
     <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">"Nastavit hlasitost budíků"</string>
+    <string name="alarm_volume_summary" msgid="8957440373896242438">"Nastavení hlasitosti 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ího tlačítka"</string>
+    <string name="volume_button_setting_title" msgid="1892885285888644234">"Chování postranních tlačítek"</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>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index e76c3e2..72662f1 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -25,13 +25,13 @@
     <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">"Indstil alarm"</string>
-    <string name="alarm_vibrate" msgid="3476686921490362230">"Vibrer"</string>
+    <string name="set_alarm" msgid="9148359866152726808">"Angiv alarm"</string>
+    <string name="alarm_vibrate" msgid="3476686921490362230">"Vibration"</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 dæmpes efter <xliff:g id="MINUTES">%d</xliff:g> minutter"</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_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">
@@ -50,13 +50,13 @@
     <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 et ur, der skal vises."</string>
+    <string name="clock_instructions" msgid="3118560284915857690">"Vælg det 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 er i lydløs tilstand"</string>
+    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarm 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">
@@ -75,16 +75,16 @@
     <item msgid="6048861883552402852">"25"</item>
     <item msgid="2740866721232379791">"30"</item>
   </string-array>
-    <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="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="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">"Indstil ønsket adfærd for sideknappen, når der trykkes på den under en alarm"</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-array name="volume_button_setting_entries">
     <item msgid="4520420953175098625">"Ingen"</item>
     <item msgid="7111908302622811168">"Slumretilstand"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b9c53a4..eba5697 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -80,15 +80,15 @@
     <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 Ablehnen der Weckerfunktion auswählen"</string>
+    <string name="alarm_notify_text" msgid="4146350965933990093">"Für Snooze-Funktion oder Beenden 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">"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 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-array name="volume_button_setting_entries">
     <item msgid="4520420953175098625">"Keine"</item>
     <item msgid="7111908302622811168">"Snooze-Funktion"</item>
-    <item msgid="8573552194573068996">"Verwerfen"</item>
+    <item msgid="8573552194573068996">"Beenden"</item>
   </string-array>
   <string-array name="volume_button_setting_values">
     <item msgid="4851033050639608752">"0"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0fdc0a1..5bc5c46 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -78,7 +78,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">"Ορισμός του αριθμού των ειδοποιήσεων"</string>
+    <string name="alarm_volume_summary" msgid="8957440373896242438">"Ορισμός της έντασης του ήχου ξυπνητηριού"</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 @@
     <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="4520420953175098625">"Καμία"</item>
     <item msgid="7111908302622811168">"Αφύπνιση"</item>
     <item msgid="8573552194573068996">"Παράβλεψη"</item>
   </string-array>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b7b23a1..968f65d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -55,8 +55,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">"Configuración"</string>
-    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarma en modo silencioso"</string>
+    <string name="settings" msgid="5849739030579520686">"Config."</string>
+    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarma en modo silencio"</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 @@
     <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">"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 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-array name="volume_button_setting_entries">
     <item msgid="4520420953175098625">"Ninguno"</item>
     <item msgid="7111908302622811168">"Recurrente"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0703746..0651255 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -58,7 +58,7 @@
     <string name="settings" msgid="5849739030579520686">"Configuración"</string>
     <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarma en modo silencio"</string>
     <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"Reproducir alarma aunque el teléfono esté en modo silencio"</string>
-    <string name="snooze_duration_title" msgid="1471249885139952670">"Duración de la posposición"</string>
+    <string name="snooze_duration_title" msgid="1471249885139952670">"Repetición de alarmas"</string>
   <string-array name="snooze_duration_entries">
     <item msgid="8337408933053603125">"5 minutos"</item>
     <item msgid="5294206441496024610">"10 minutos"</item>
@@ -80,10 +80,10 @@
     <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">"Elija si desea posponer o descartar esta alarma."</string>
+    <string name="alarm_notify_text" msgid="4146350965933990093">"Elige si deseas 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>. Seleccione la opción para cancelarla."</string>
-    <string name="volume_button_setting_title" msgid="1892885285888644234">"Comportamiento de botón lateral"</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="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>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2017030..e435f93 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -17,7 +17,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="6642875149600019623">"Réveil"</string>
     <string name="add_alarm" msgid="5976616107390962899">"Ajouter alarme"</string>
-    <string name="delete_alarm" msgid="3457780990646206817">"Désactiver l\'alarme"</string>
+    <string name="delete_alarm" msgid="3457780990646206817">"Supprimer 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>
@@ -57,7 +57,7 @@
     <string name="analog_gadget" msgid="1670505720837152766">"Horloge analogique"</string>
     <string name="settings" msgid="5849739030579520686">"Paramètres"</string>
     <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarme mode silencieux"</string>
-    <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>
+    <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>
     <string name="snooze_duration_title" msgid="1471249885139952670">"Répéter après"</string>
   <string-array name="snooze_duration_entries">
     <item msgid="8337408933053603125">"5 minutes"</item>
@@ -84,7 +84,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 les actions effectuées par les boutons latéraux lors d\'une alarme."</string>
+    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Définir les actions des 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>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1989fb3..3beade8 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -56,7 +56,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. silenziosa"</string>
+    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Allarme in mod. silenz."</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 @@
     <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">"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 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-array name="volume_button_setting_entries">
     <item msgid="4520420953175098625">"Nessuno"</item>
     <item msgid="7111908302622811168">"Sospendi"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 65ccbfb..81872d4 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -36,13 +36,13 @@
     <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>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b691317..f2327b1 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -78,7 +78,7 @@
     <string name="done" msgid="6509722361933858451">"Gereed"</string>
     <string name="revert" msgid="9100911171235162926">"Terugzetten"</string>
     <string name="alarm_volume_title" msgid="8506245173912428522">"Alarmvolume"</string>
-    <string name="alarm_volume_summary" msgid="8957440373896242438">"Het volume van alarmen instellen"</string>
+    <string name="alarm_volume_summary" msgid="8957440373896242438">"Het volume van het alarm instellen"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Stil"</string>
     <string name="alarm_notify_text" msgid="4146350965933990093">"Selecteer of u snooze wilt selecteren voor dit alarm of het alarm wilt negeren."</string>
     <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (snooze aan)"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 14a7810..8162d6d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -26,7 +26,7 @@
     <string name="label" msgid="162189613902857319">"Ярлык"</string>
     <string name="default_label" msgid="5590025289805630372">"Будильник"</string>
     <string name="set_alarm" msgid="9148359866152726808">"Установить будильник"</string>
-    <string name="alarm_vibrate" msgid="3476686921490362230">"Вибрация"</string>
+    <string name="alarm_vibrate" msgid="3476686921490362230">"Вибросигнал"</string>
     <string name="alarm_repeat" msgid="7242985466344233206">"Повтор"</string>
     <string name="alert" msgid="6539852766423700221">"Мелодия"</string>
     <string name="time" msgid="8067216534232296518">"Время"</string>
@@ -76,7 +76,7 @@
     <item msgid="2740866721232379791">"30"</item>
   </string-array>
     <string name="done" msgid="6509722361933858451">"Готово"</string>
-    <string name="revert" msgid="9100911171235162926">"Отменить изменения"</string>
+    <string name="revert" msgid="9100911171235162926">"Отмена"</string>
     <string name="alarm_volume_title" msgid="8506245173912428522">"Громкость будильника"</string>
     <string name="alarm_volume_summary" msgid="8957440373896242438">"Настройка громкости будильника"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Без звука"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 260a3bb..ec9dc77 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -84,9 +84,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 sidoknapparna om de används under ett alarm"</string>
+    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Ange önskad funktion för sidoknappen under alarm"</string>
   <string-array name="volume_button_setting_entries">
-    <item msgid="4520420953175098625">"Inga"</item>
+    <item msgid="4520420953175098625">"Ingen"</item>
     <item msgid="7111908302622811168">"Snooze"</item>
     <item msgid="8573552194573068996">"Ta bort permanent"</item>
   </string-array>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e03623d..4b87303 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -84,7 +84,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 yan düğmenin nasıl işlev görmesini istediğinizi ayarlayın"</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-array name="volume_button_setting_entries">
     <item msgid="4520420953175098625">"Yok"</item>
     <item msgid="7111908302622811168">"Ertele"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 477ff40..ae308be 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -30,19 +30,19 @@
     <string name="alarm_repeat" msgid="7242985466344233206">"重复"</string>
     <string name="alert" msgid="6539852766423700221">"铃声"</string>
     <string name="time" msgid="8067216534232296518">"时间"</string>
-    <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"关闭"</string>
-    <string name="alarm_alert_alert_silenced" msgid="7918075929961104202">"闹钟提示已过 <xliff:g id="MINUTES">%d</xliff:g> 分钟"</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 name="alarm_alert_dismiss_text" msgid="4942914605480888820">"取消"</string>
+    <string name="alarm_alert_alert_silenced" msgid="7918075929961104202">"闹钟响了 <xliff:g id="MINUTES">%d</xliff:g> 分钟后停止"</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="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 @@
     <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">"暂停时长"</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">"再响间隔"</string>
   <string-array name="snooze_duration_entries">
     <item msgid="8337408933053603125">"5 分钟"</item>
     <item msgid="5294206441496024610">"10 分钟"</item>
@@ -82,9 +82,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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 6f60110..883e3c6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -35,14 +35,14 @@
     <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 +53,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 +82,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">
diff --git a/src/com/android/alarmclock/AlarmKlaxon.java b/src/com/android/alarmclock/AlarmKlaxon.java
index 7205db6..a8891c1 100644
--- a/src/com/android/alarmclock/AlarmKlaxon.java
+++ b/src/com/android/alarmclock/AlarmKlaxon.java
@@ -229,10 +229,15 @@
     private void startAlarm(MediaPlayer player)
             throws java.io.IOException, IllegalArgumentException,
                    IllegalStateException {
-        player.setAudioStreamType(AudioManager.STREAM_ALARM);
-        player.setLooping(true);
-        player.prepare();
-        player.start();
+        final AudioManager audioManager = (AudioManager)getSystemService(Context.AUDIO_SERVICE);
+        // do not play alarms if stream volume is 0
+        // (typically because ringer mode is silent).
+        if (audioManager.getStreamVolume(AudioManager.STREAM_ALARM) != 0) {
+            player.setAudioStreamType(AudioManager.STREAM_ALARM);
+            player.setLooping(true);
+            player.prepare();
+            player.start();
+        }
     }
 
     private void setDataSourceFromResource(Resources resources,