Merge branch 'gingerbread' of git://android.git.kernel.org/platform/packages/apps/DeskClock into HEAD

Conflicts:
	res/values-fr/strings.xml

Change-Id: Ifd60ff1cf34ad0bcf96bdba3ccfddbd958446254

4 files changed, 11 insertions, 11 deletions

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index f776855c0..b55a39959 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -26,13 +26,13 @@
     <string name="disable_alarm" msgid="5889378670229554109">"Desactiva l\'alarma"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"Aquesta alarma se suprimirà."</string>
     <string name="show_clock" msgid="8358759982675616915">"Mostra el rellotge"</string>
-    <string name="hide_clock" msgid="3217727306480505694">"Oculta el rellotge"</string>
+    <string name="hide_clock" msgid="3217727306480505694">"Amaga el rellotge"</string>
     <string name="label" msgid="162189613902857319">"Etiqueta"</string>
     <string name="default_label" msgid="5590025289805630372">"Alarma"</string>
     <string name="set_alarm" msgid="9148359866152726808">"Defineix l\'alarma"</string>
     <string name="alarm_vibrate" msgid="3476686921490362230">"Vibra"</string>
     <string name="alarm_repeat" msgid="7242985466344233206">"Repeteix"</string>
-    <string name="alert" msgid="6539852766423700221">"So de trucada"</string>
+    <string name="alert" msgid="6539852766423700221">"To"</string>
     <string name="time" msgid="8067216534232296518">"Hora"</string>
     <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Omet"</string>
     <string name="alarm_alert_alert_silenced" msgid="7918075929961104202">"L\'alarma se silencia al cap de <xliff:g id="MINUTES">%d</xliff:g> minuts"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 38738afcd..f206864d2 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -29,15 +29,15 @@
     <string name="hide_clock" msgid="3217727306480505694">"Ocultar reloj"</string>
     <string name="label" msgid="162189613902857319">"Etiqueta"</string>
     <string name="default_label" msgid="5590025289805630372">"Alarma"</string>
-    <string name="set_alarm" msgid="9148359866152726808">"Fijar alarma"</string>
+    <string name="set_alarm" msgid="9148359866152726808">"Establecer alarma"</string>
     <string name="alarm_vibrate" msgid="3476686921490362230">"Vibrar"</string>
     <string name="alarm_repeat" msgid="7242985466344233206">"Repetir"</string>
     <string name="alert" msgid="6539852766423700221">"Tono"</string>
-    <string name="time" msgid="8067216534232296518">"Duración"</string>
+    <string name="time" msgid="8067216534232296518">"Hora"</string>
     <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Descartar"</string>
     <string name="alarm_alert_alert_silenced" msgid="7918075929961104202">"Alarma silenciada después de <xliff:g id="MINUTES">%d</xliff:g> minutos"</string>
     <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Posponer"</string>
-    <string name="alarm_alert_snooze_set" msgid="656470966696912087">"Recurrente a los <xliff:g id="MINUTES">%d</xliff:g> minutos."</string>
+    <string name="alarm_alert_snooze_set" msgid="656470966696912087">"La alarma volverá a sonar en <xliff:g id="MINUTES">%d</xliff:g> minutos."</string>
   <string-array name="alarm_set">
     <item msgid="5163476010406761625">"Esta alarma se activará en menos de un minuto a partir de ahora."</item>
     <item msgid="7110525731259629055">"Esta alarma se activará en <xliff:g id="DAYS">%1$s</xliff:g> a partir de ahora."</item>
@@ -78,7 +78,7 @@
     <string name="alarm_volume_summary" msgid="8957440373896242438">"Establecer el volumen de las alarmas"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Silencioso"</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> (recurrente)"</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">"Esta alarma se activará en <xliff:g id="TIME">%s</xliff:g>. Selecciona para cancelar."</string>
     <string name="volume_button_setting_title" msgid="8155275533660105161">"Volumen y cámara"</string>
     <string name="volume_button_dialog_title" msgid="8768042543750036853">"Efecto del botón"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f1a50061f..698683bdf 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -94,7 +94,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="8155275533660105161">"Volume/appareil photo"</string>
-    <string name="volume_button_dialog_title" msgid="8768042543750036853">"Effet du bouton"</string>
+    <string name="volume_button_dialog_title" msgid="8768042543750036853">"Effet des boutons"</string>
     <string name="volume_button_setting_summary" msgid="4776447991226047070">"Définir les actions de ces boutons lorsqu\'ils sont utilisés pendant une alarme"</string>
   <string-array name="volume_button_setting_entries">
     <item msgid="4520420953175098625">"Aucun"</item>
@@ -110,7 +110,6 @@
     <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="weather_fetch_failure" msgid="7517010911981312358">"La météo n\'est pas disponible pour le moment."</string>
     <string name="menu_item_dock_settings" msgid="3524235151132971114">"Paramètres station d\'accueil"</string>
-    <string name="alarm_klaxon_service_desc" msgid="2153290655559916468">"Lancez le service de lecture pour les alarmes définies via l\'Horloge de bureau."</string>
     <string name="alarm_limit_title">Durée alarme maximum</string>
     <string name="screensaver_timeout_title">Temps avant veille</string>
     <string name="color_picker">Couleur de l\'heure</string>
@@ -125,4 +124,5 @@
     <string name="use_dual_mode_button">Mode dual Snooze</string>
     <string name="use_dual_mode_button_on">Une pression longue sur le bouton Répéter annulera l\'alarme</string>
     <string name="use_dual_mode_button_off">Les boutons Répéter et Quitter seront séparés</string>
+    <string name="alarm_klaxon_service_desc" msgid="2153290655559916468">"Lancer le service de lecture pour les alarmes définies via l\'Horloge de bureau"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b7cc6119d..6dd43f2a4 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -22,8 +22,8 @@
     <string name="menu_desk_clock" msgid="3241995064554071588">"卓上時計"</string>
     <string name="menu_edit_alarm" msgid="7204602994918829751">"アラームを編集"</string>
     <string name="delete_alarm" msgid="3457780990646206817">"アラームを削除"</string>
-    <string name="enable_alarm" msgid="1834599140632142536">"アラームをオンにする"</string>
-    <string name="disable_alarm" msgid="5889378670229554109">"アラームをオフにする"</string>
+    <string name="enable_alarm" msgid="1834599140632142536">"アラームをONにする"</string>
+    <string name="disable_alarm" msgid="5889378670229554109">"アラームをOFFにする"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"このアラームを削除します。"</string>
     <string name="show_clock" msgid="8358759982675616915">"時計を表示"</string>
     <string name="hide_clock" msgid="3217727306480505694">"時計を隠す"</string>
@@ -104,7 +104,7 @@
     <string name="desk_clock_button_description" msgid="968868045496561043">"時計のディスプレイ"</string>
     <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="weather_fetch_failure" msgid="7517010911981312358">"天気予報は現在ご利用いただけません。"</string>
-    <string name="menu_item_dock_settings" msgid="3524235151132971114">"ドックの設定"</string>
+    <string name="menu_item_dock_settings" msgid="3524235151132971114">"ホルダーの設定"</string>
     <string name="alarm_klaxon_service_desc" msgid="2153290655559916468">"卓上時計で設定したアラーム用のサウンド再生サービスです。"</string>
 
     <string name="alarm_limit_title">アラームの最大持続時間</string>