merge in ics-mr1-release history after reset to ics-mr1
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index e6c038b..37dd303 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -24,7 +24,7 @@
<string name="delete_alarm" msgid="3457780990646206817">"Vee wekker uit"</string>
<string name="enable_alarm" msgid="1834599140632142536">"Skakel wekker aan"</string>
<string name="disable_alarm" msgid="5889378670229554109">"Skakel wekker af"</string>
- <string name="delete_alarm_confirm" msgid="6578572637340860840">"Vee hierdie wekker uit?"</string>
+ <string name="delete_alarm_confirm" msgid="6578572637340860840">"Vee hierdie alarm uit?"</string>
<string name="show_clock" msgid="8358759982675616915">"Vertoon klok"</string>
<string name="hide_clock" msgid="3217727306480505694">"Versteek horlosie"</string>
<string name="label" msgid="162189613902857319">"Etiket"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0ec3093..95a5bf4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -18,7 +18,7 @@
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="add_alarm" msgid="5976616107390962899">"Přidat upozornění"</string>
+ <string name="add_alarm" msgid="5976616107390962899">"Přidat budík"</string>
<string name="menu_desk_clock" msgid="3241995064554071588">"Stolní hodiny"</string>
<string name="menu_edit_alarm" msgid="7204602994918829751">"Upravit budík"</string>
<string name="delete_alarm" msgid="3457780990646206817">"Smazat budík"</string>
@@ -27,9 +27,9 @@
<string name="delete_alarm_confirm" msgid="6578572637340860840">"Smazat tento budík?"</string>
<string name="show_clock" msgid="8358759982675616915">"Zobrazit hodiny"</string>
<string name="hide_clock" msgid="3217727306480505694">"Skrýt hodiny"</string>
- <string name="label" msgid="162189613902857319">"Štítek"</string>
+ <string name="label" msgid="162189613902857319">"Popis"</string>
<string name="default_label" msgid="5590025289805630372">"Budík"</string>
- <string name="set_alarm" msgid="9148359866152726808">"Nastavit upozornění"</string>
+ <string name="set_alarm" msgid="9148359866152726808">"Nastavit budík"</string>
<string name="alarm_vibrate" msgid="3476686921490362230">"Vibrace"</string>
<string name="alarm_repeat" msgid="7242985466344233206">"Opakovat"</string>
<string name="alert" msgid="6539852766423700221">"Vyzváněcí tón"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e5c1b40..3ceaeeb 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -59,7 +59,7 @@
<string name="day_concat" msgid="971998564991636532">", "</string>
<string name="clock_instructions" msgid="2656876819515011590">"Seleccionar un reloj"</string>
<string name="analog_gadget" msgid="1670505720837152766">"Reloj analógico"</string>
- <string name="settings" msgid="5849739030579520686">"Config."</string>
+ <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 cuando el teléfono está en modo silencioso"</string>
<string name="snooze_duration_title" msgid="1471249885139952670">"Duración de la repetición de alarma"</string>
@@ -81,9 +81,9 @@
</string-array>
<string name="auto_silence_title" msgid="6940612987809171112">"Silenciar automáticamente"</string>
<string name="auto_silence_summary" msgid="5757272454196171758">"Las alarmas se silenciarán después de <xliff:g id="MINUTES">%d</xliff:g> minutos"</string>
- <string name="auto_silence_never" msgid="4302257878142130807">"Apagado"</string>
+ <string name="auto_silence_never" msgid="4302257878142130807">"Desactivado"</string>
<string-array name="auto_silence_entries">
- <item msgid="7718972982871612080">"Apagado"</item>
+ <item msgid="7718972982871612080">"Desactivado"</item>
<item msgid="5431906692406316549">"5 minutos"</item>
<item msgid="7742728812068919959">"10 minutos"</item>
<item msgid="2855948657259647629">"15 minutos"</item>
@@ -94,14 +94,14 @@
<string name="done" msgid="6509722361933858451">"Listo"</string>
<string name="revert" msgid="9100911171235162926">"Revertir"</string>
<string name="delete" msgid="5732434972457000541">"Eliminar"</string>
- <string name="alarm_volume_title" msgid="8506245173912428522">"Volumen de la alarma"</string>
+ <string name="alarm_volume_title" msgid="8506245173912428522">"Volumen"</string>
<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="4891014685945904766">"Posponer o ignorar 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="4819324081410990368">"La alarma sonará a las <xliff:g id="TIME">%s</xliff:g>. Toca para cancelarla."</string>
<string name="volume_button_setting_title" msgid="6937131248843413357">"Botones de volumen"</string>
- <string name="volume_button_dialog_title" msgid="8768042543750036853">"Efecto del botón"</string>
+ <string name="volume_button_dialog_title" msgid="8768042543750036853">"Acción de los botones"</string>
<string name="volume_button_setting_summary" msgid="4776447991226047070">"Configurar las acciones de los botones durante una alarma"</string>
<string-array name="volume_button_setting_entries">
<item msgid="4520420953175098625">"Ninguno"</item>
@@ -125,6 +125,6 @@
<string name="menu_item_dock_settings" msgid="3524235151132971114">"Configuración de la base"</string>
<string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Servicio de reproducción de sonidos para alarmas configuradas en Reloj"</string>
<string name="loading_ringtone" msgid="6523322777415268044">"Cargando tono..."</string>
- <string name="control_set_alarm" msgid="2194676418924016327">"Fijar alarma"</string>
- <string name="control_set_alarm_with_existing" msgid="1128169496817859490">"Se fijó la alarma: <xliff:g id="TIME">%s</xliff:g>"</string>
+ <string name="control_set_alarm" msgid="2194676418924016327">"Establecer alarma"</string>
+ <string name="control_set_alarm_with_existing" msgid="1128169496817859490">"Alarma: <xliff:g id="TIME">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index a2b6890..08a9caa 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -24,7 +24,8 @@
<string name="delete_alarm" msgid="3457780990646206817">"Stizzar il svegliarin"</string>
<string name="enable_alarm" msgid="1834599140632142536">"Activar il svegliarin"</string>
<string name="disable_alarm" msgid="5889378670229554109">"Deactivar il svegliarin"</string>
- <!-- outdated translation 4237696873219106907 --> <string name="delete_alarm_confirm" msgid="6578572637340860840">"Quest svegliarin vegn stizzà."</string>
+ <!-- no translation found for delete_alarm_confirm (6578572637340860840) -->
+ <skip />
<string name="show_clock" msgid="8358759982675616915">"Mussar l\'ura"</string>
<string name="hide_clock" msgid="3217727306480505694">"Zuppentar l\'ura"</string>
<string name="label" msgid="162189613902857319">"Etichetta"</string>
@@ -39,6 +40,7 @@
<skip />
<string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Repeter"</string>
<string name="alarm_alert_snooze_set" msgid="656470966696912087">"Repetiziun en <xliff:g id="MINUTES">%d</xliff:g> minutas."</string>
+ <!-- no translation found for alarm_set:0 (6450913786084215050) -->
<!-- no translation found for alarm_set:1 (6002066367368421848) -->
<!-- no translation found for alarm_set:2 (8824719306247973774) -->
<!-- no translation found for alarm_set:3 (8182406852935468862) -->
@@ -52,10 +54,12 @@
<string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> uras"</string>
<string name="minute" msgid="2486157997434653710">"1 minuta"</string>
<string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutas"</string>
- <!-- outdated translation 1058994798884544691 --> <string name="every_day" msgid="4100909974923444602">"mintga di"</string>
+ <!-- no translation found for every_day (4100909974923444602) -->
+ <skip />
<string name="never" msgid="54104287800571769">"Mai"</string>
- <string name="day_concat" msgid="971998564991636532">"\",\" "</string>
- <!-- outdated translation 3118560284915857690 --> <string name="clock_instructions" msgid="2656876819515011590">"Tscherni l\'ura che duai vegnir mussada."</string>
+ <string name="day_concat" msgid="971998564991636532">", "</string>
+ <!-- no translation found for clock_instructions (2656876819515011590) -->
+ <skip />
<string name="analog_gadget" msgid="1670505720837152766">"Ura analoga"</string>
<string name="settings" msgid="5849739030579520686">"Parameters"</string>
<string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Svegliarin en il modus silenzius"</string>
@@ -92,15 +96,17 @@
<!-- no translation found for auto_silence_entries:6 (2807487305575255986) -->
<string name="done" msgid="6509722361933858451">"Finì"</string>
<string name="revert" msgid="9100911171235162926">"Reinizialisar"</string>
- <string name="delete" msgid="5732434972457000541">"\"Stizzar"</string>
+ <string name="delete" msgid="5732434972457000541">"Stizzar"</string>
<string name="alarm_volume_title" msgid="8506245173912428522">"Volumen dal svegliarin"</string>
<string name="alarm_volume_summary" msgid="8957440373896242438">"Reglar il volumen dal svegliarin"</string>
<string name="silent_alarm_summary" msgid="8605302849408279221">"Silenzius"</string>
- <!-- outdated translation 4146350965933990093 --> <string name="alarm_notify_text" msgid="4891014685945904766">"Tscherni da repeter u da deactivar quest svegliarin."</string>
+ <!-- no translation found for alarm_notify_text (4891014685945904766) -->
+ <skip />
<string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (repetiziun)"</string>
<!-- no translation found for alarm_notify_snooze_text (4819324081410990368) -->
<skip />
- <!-- outdated translation 8155275533660105161 --> <string name="volume_button_setting_title" msgid="6937131248843413357">"Volumen e Camera"</string>
+ <!-- no translation found for volume_button_setting_title (6937131248843413357) -->
+ <skip />
<string name="volume_button_dialog_title" msgid="8768042543750036853">"Effect dal buttun"</string>
<string name="volume_button_setting_summary" msgid="4776447991226047070">"Defini las acziuns da quests buttuns sch\'els vegnan smatgads durant ch\'il svegliarin scalina."</string>
<string-array name="volume_button_setting_entries">
@@ -119,9 +125,11 @@
<string name="music_button_description" msgid="1626593420810117999">"Musica"</string>
<string name="nightmode_button_description" msgid="990894208217576381">"Stgirentar"</string>
<string name="home_button_description" msgid="3383859096809056157">"Lantschader"</string>
- <!-- outdated translation 968868045496561043 --> <string name="desk_clock_button_description" msgid="4207371097361657274">"Visualisaziun da l\'ura"</string>
+ <!-- no translation found for desk_clock_button_description (4207371097361657274) -->
+ <skip />
<string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
- <!-- outdated translation 7517010911981312358 --> <string name="weather_fetch_failure" msgid="3425804832021006835">"Infurmaziuns davart l\'aura n\'èn betg disponiblas en il mument."</string>
+ <!-- no translation found for weather_fetch_failure (3425804832021006835) -->
+ <skip />
<string name="menu_item_dock_settings" msgid="3524235151132971114">"Parameters da la basa"</string>
<!-- no translation found for alarm_klaxon_service_desc (2147506334302260256) -->
<skip />
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index fd039e6..c2c2bb1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -20,7 +20,7 @@
<string name="alarm_list_title" msgid="7589940465292950600">"Будильник"</string>
<string name="add_alarm" msgid="5976616107390962899">"Добавить будильник"</string>
<string name="menu_desk_clock" msgid="3241995064554071588">"Настольные часы"</string>
- <string name="menu_edit_alarm" msgid="7204602994918829751">"Изменить настройки будильника"</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>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9598b6d..f5b1442 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -53,7 +53,7 @@
<string name="hour" msgid="2546819039651509323">"1 ihora"</string>
<string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> amahora"</string>
<string name="minute" msgid="2486157997434653710">"Iminithi elingu-1"</string>
- <string name="minutes" msgid="6115838729146292526">"Amaminithi angu-<xliff:g id="MINUTES">%s</xliff:g>"</string>
+ <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> amaminithi"</string>
<string name="every_day" msgid="4100909974923444602">"Nsuku zonke"</string>
<string name="never" msgid="54104287800571769">"Akusoze"</string>
<string name="day_concat" msgid="971998564991636532">", "</string>
@@ -64,12 +64,12 @@
<string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"Dlala i-alamu ngisho noma ifoni ikwimodi ethulile."</string>
<string name="snooze_duration_title" msgid="1471249885139952670">"Ubude bokusnuza"</string>
<string-array name="snooze_duration_entries">
- <item msgid="8337408933053603125">"amaminithi angu-5"</item>
- <item msgid="5294206441496024610">"amaminithi angu-10"</item>
- <item msgid="2165904039211935470">"amaminithi angu-15"</item>
- <item msgid="7248236967714374250">"amaminithi angu-20"</item>
- <item msgid="738394723625179423">"amaminithi angu-25"</item>
- <item msgid="1180222611308391616">"amaminithi angu-30"</item>
+ <item msgid="8337408933053603125">"5 amaminithi"</item>
+ <item msgid="5294206441496024610">"10 amaminithi"</item>
+ <item msgid="2165904039211935470">"15 amaminithi"</item>
+ <item msgid="7248236967714374250">"20 amaminithi"</item>
+ <item msgid="738394723625179423">"25 amaminithi"</item>
+ <item msgid="1180222611308391616">"30 amaminithi"</item>
</string-array>
<string-array name="snooze_duration_values">
<item msgid="3655014754453084122">"5"</item>
@@ -84,12 +84,12 @@
<string name="auto_silence_never" msgid="4302257878142130807">"Valiwe"</string>
<string-array name="auto_silence_entries">
<item msgid="7718972982871612080">"Valiwe"</item>
- <item msgid="5431906692406316549">"amaminithi angu-5"</item>
- <item msgid="7742728812068919959">"amaminithi angu-10"</item>
- <item msgid="2855948657259647629">"amaminithi angu-15"</item>
- <item msgid="6330196381284475079">"amaminithi angu-20"</item>
- <item msgid="7809240121716151904">"amaminithi angu-25"</item>
- <item msgid="2807487305575255986">"amaminithi angu-30"</item>
+ <item msgid="5431906692406316549">"5 amaminithi"</item>
+ <item msgid="7742728812068919959">"10 amaminithi"</item>
+ <item msgid="2855948657259647629">"15 amaminithi"</item>
+ <item msgid="6330196381284475079">"20 amaminithi"</item>
+ <item msgid="7809240121716151904">"25 amaminithi"</item>
+ <item msgid="2807487305575255986">"30 amaminithi"</item>
</string-array>
<string name="done" msgid="6509722361933858451">"Kwenziwe"</string>
<string name="revert" msgid="9100911171235162926">"Buyela emuva"</string>
