resolved conflicts for merge of f30a09a7 to master

diff --cc res/values-es-rUS/strings.xml
Simple merge

diff --cc res/values-ko/strings.xml
index c363cf0,723192d..2678a75
--- 1/res/values-ko/strings.xml
--- 2/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@@ -28,11 -29,13 +29,12 @@@
      <string name="alarm_repeat">"반복"</string>
      <string name="alert">"벨소리"</string>
      <string name="time">"시간"</string>
 -    <string name="alert_title">"알람"</string>
      <string name="alarm_alert_dismiss_text">"해제"</string>
-     <string name="alarm_alert_alert_silenced">"<xliff:g id="MINUTES">%d</xliff:g>분 후에 알람이 꺼집니다."</string>
-     <string name="alarm_alert_snooze_text">"스누즈"</string>
-     <string name="alarm_alert_snooze_set">"<xliff:g id="MINUTES">%d</xliff:g>분 동안 스누즈"</string>
-     <string name="alarm_set">"이 알람은 지금부터 <xliff:g id="TIME_DELTA">%s</xliff:g> 동안 설정됩니다."</string>
+     <string name="alarm_alert_alert_silenced">"<xliff:g id="MINUTES">%d</xliff:g>분 후 알람이 중지됨"</string>
+     <string name="alarm_alert_snooze_text">"다시 울림"</string>
+     <string name="alarm_alert_snooze_set">"<xliff:g id="MINUTES">%d</xliff:g>분 동안 알람 일시 중지"</string>
+     <string name="alarm_alert_snooze_not_set">"다시 울림을 설정할 수 없음 -- 다음 알람 <xliff:g id="TIME">%s</xliff:g>"</string>
+     <string name="alarm_set">"지금부터 <xliff:g id="TIME_DELTA">%s</xliff:g> 후로 알람이 설정됩니다."</string>
      <string name="combiner">"<xliff:g id="XXX_0">%1$s</xliff:g><xliff:g id="XXX_1">%2$s</xliff:g><xliff:g id="XXX_2">%3$s</xliff:g><xliff:g id="XXX_3">%4$s</xliff:g><xliff:g id="XXX_4">%5$s</xliff:g>"</string>
      <string name="day">"1일"</string>
      <string name="days">"<xliff:g id="DAYS">%s</xliff:g>일"</string>

diff --cc res/values-ru/strings.xml
index d28a075,6c797e0..65e3945
--- 1/res/values-ru/strings.xml
--- 2/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@@ -24,31 -24,34 +24,33 @@@
      <string name="label">"Ярлык"</string>
      <string name="default_label">"Будильник"</string>
      <string name="set_alarm">"Установить будильник"</string>
 -    <string name="enable">"Включить будильник"</string>
      <string name="alarm_vibrate">"Вибрация"</string>
      <string name="alarm_repeat">"Повтор"</string>
-     <string name="alert">"Мелодия звонка"</string>
+     <string name="alert">"Мелодия"</string>
      <string name="time">"Время"</string>
-     <string name="alarm_alert_dismiss_text">"Закрыть"</string>
-     <string name="alarm_alert_alert_silenced">"Будильник отключается через <xliff:g id="MINUTES">%d</xliff:g> минут(ы)"</string>
-     <string name="alarm_alert_snooze_text">"Отсрочка"</string>
-     <string name="alarm_alert_snooze_set">"Отсрочка на <xliff:g id="MINUTES">%d</xliff:g> минут(ы)."</string>
-     <string name="alarm_set">"Будильник прозвонит через <xliff:g id="TIME_DELTA">%s</xliff:g>"</string>
+     <string name="alert_title">"Будильник"</string>
+     <string name="alarm_alert_dismiss_text">"Игнорировать"</string>
+     <string name="alarm_alert_alert_silenced">"Будильник выключился спустя <xliff:g id="MINUTES">%d</xliff:g> мин."</string>
+     <string name="alarm_alert_snooze_text">"Спящий режим"</string>
+     <string name="alarm_alert_snooze_set">"Отсрочка будильника на <xliff:g id="MINUTES">%d</xliff:g> мин."</string>
+     <string name="alarm_alert_snooze_not_set">"Отсрочка будильника не установлена – следующий сигнал прозвучит в <xliff:g id="TIME">%s</xliff:g>"</string>
+     <string name="alarm_set">"Будильник зазвонит через <xliff:g id="TIME_DELTA">%s</xliff:g>."</string>
      <string name="combiner">"<xliff:g id="XXX_0">%1$s</xliff:g><xliff:g id="XXX_1">%2$s</xliff:g><xliff:g id="XXX_2">%3$s</xliff:g><xliff:g id="XXX_3">%4$s</xliff:g><xliff:g id="XXX_4">%5$s</xliff:g>"</string>
      <string name="day">"1 день"</string>
-     <string name="days">"<xliff:g id="DAYS">%s</xliff:g> дня(ей)"</string>
+     <string name="days">"<xliff:g id="DAYS">%s</xliff:g> дн."</string>
      <string name="hour">"1 час"</string>
-     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g> часа(ов)"</string>
+     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g> ч."</string>
      <string name="and">" и "</string>
      <string name="space">" "</string>
-     <string name="subminute">"менее 1 минуты"</string>
+     <string name="subminute">"меньше 1 минуты"</string>
      <string name="minute">"1 минута"</string>
-     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> минут(ы)"</string>
-     <string name="every_day">"ежедневно"</string>
+     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> мин."</string>
+     <string name="every_day">"каждÑ\8bй денÑ\8c"</string>
      <string name="never">"Никогда"</string>
      <string name="day_concat">", "</string>
-     <string name="clock_instructions">"Выберите часы для отображения"</string>
+     <string name="clock_instructions">"Выберите вид часов."</string>
      <string name="error">"Будильник не установлен"</string>
-     <string name="dberror">"К сожалению, установить будильник не удалось."</string>
+     <string name="dberror">"К сожалению, будильник не удалось установить."</string>
      <string name="analog_gadget">"Часы со стрелками"</string>
      <string name="settings">"Настройки"</string>
      <string name="alarm_in_silent_mode_title">"Будильник в тихом режиме"</string>

diff --cc res/values-zh-rCN/strings.xml
index 453e925,38f88a2..ddc3e74
--- 1/res/values-zh-rCN/strings.xml
--- 2/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@@ -22,8 -22,9 +22,8 @@@
      <string name="show_clock">"显示时钟"</string>
      <string name="hide_clock">"隐藏时钟"</string>
      <string name="label">"标签"</string>
-     <string name="default_label">"警报"</string>
+     <string name="default_label">"闹钟"</string>
      <string name="set_alarm">"设置闹钟"</string>
 -    <string name="enable">"开启闹钟"</string>
      <string name="alarm_vibrate">"振动"</string>
      <string name="alarm_repeat">"重复"</string>
      <string name="alert">"铃声"</string>

diff --cc res/values-zh-rTW/strings.xml
Simple merge