OSDN Git Service

Make the "This alarm is set for N hours from now" message more localizable.
authorEric Fischer <enf@google.com>
Tue, 21 Jul 2009 23:28:30 +0000 (16:28 -0700)
committerEric Fischer <enf@google.com>
Tue, 21 Jul 2009 23:28:30 +0000 (16:28 -0700)
It was concatenating the days/minutes/seconds segments together with an
"and" string, which works OK in English but not so well in other languages.

Bug 1973471

22 files changed:
res/values-cs/strings.xml
res/values-da/strings.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-es-rUS/strings.xml
res/values-es/strings.xml
res/values-fr/strings.xml
res/values-it/strings.xml
res/values-ja/strings.xml
res/values-ko/strings.xml
res/values-nb/strings.xml
res/values-nl/strings.xml
res/values-pl/strings.xml
res/values-pt-rPT/strings.xml
res/values-pt/strings.xml
res/values-ru/strings.xml
res/values-sv/strings.xml
res/values-tr/strings.xml
res/values-zh-rCN/strings.xml
res/values-zh-rTW/strings.xml
res/values/strings.xml
src/com/android/alarmclock/SetAlarm.java

index 55108c1..c90fe0f 100644 (file)
     <string name="alarm_alert_snooze_text">"Odložit"</string>
     <string name="alarm_alert_snooze_set">"Upozornění odloženo o <xliff:g id="MINUTES">%d</xliff:g> min."</string>
     <string name="alarm_alert_snooze_not_set">"Upozornění nebylo odloženo – další upozornění v <xliff:g id="TIME">%s</xliff:g>."</string>
-    <string name="alarm_set">"Tento budík bude aktivován za: <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 den"</string>
     <string name="days">"dní: <xliff:g id="DAYS">%s</xliff:g>"</string>
     <string name="hour">"1 hodina"</string>
     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g> hod."</string>
-    <string name="and">" a "</string>
-    <string name="space">" "</string>
-    <string name="subminute">"méně než 1 minuta"</string>
     <string name="minute">"1 minuta"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> min"</string>
     <string name="every_day">"Každý den"</string>
index f6fb0ed..5c18441 100644 (file)
     <string name="alarm_alert_snooze_text">"Slumretilstand"</string>
     <string name="alarm_alert_snooze_set">"Slumrer i <xliff:g id="MINUTES">%d</xliff:g> minutter."</string>
     <string name="alarm_alert_snooze_not_set">"Der er ikke indstillet slumretilstand. Næste alarm er indstillet til <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="alarm_set">"Alarmen er indstillet til <xliff:g id="TIME_DELTA">%s</xliff:g> fra nu af."</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 dag"</string>
     <string name="days">"<xliff:g id="DAYS">%s</xliff:g> dage"</string>
     <string name="hour">"1 time"</string>
     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g> timer"</string>
-    <string name="and">" og "</string>
-    <string name="space">" "</string>
-    <string name="subminute">"mindre end 1 minut"</string>
     <string name="minute">"1 minut"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> minutter"</string>
     <string name="every_day">"hver dag"</string>
index 9749484..773a98a 100644 (file)
     <string name="alarm_alert_snooze_text">"Snooze-Funktion"</string>
     <string name="alarm_alert_snooze_set">"Snooze-Funktion aktiviert für <xliff:g id="MINUTES">%d</xliff:g> Minuten"</string>
     <string name="alarm_alert_snooze_not_set">"Snooze-Funktion nicht aktiviert - nächster Wecker klingelt <xliff:g id="TIME">%s</xliff:g>."</string>
-    <string name="alarm_set">"Dieser Wecker klingelt in <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 Tag"</string>
     <string name="days">"<xliff:g id="DAYS">%s</xliff:g> Tagen"</string>
     <string name="hour">"1 Stunde"</string>
     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g> Stunden"</string>
-    <string name="and">" und "</string>
-    <string name="space">" "</string>
-    <string name="subminute">"weniger als 1 Minute"</string>
     <string name="minute">"1 Minute"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> Minuten"</string>
     <string name="every_day">"Täglich"</string>
index 94d9cb5..6f91b51 100644 (file)
     <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="hour">"1 ώρα"</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="minute">"1 λεπτό"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> λεπτά"</string>
     <string name="every_day">"κάθε μέρα"</string>
index 4cad3ad..4cf2715 100644 (file)
     <string name="alarm_alert_snooze_text">"Recurrente"</string>
     <string name="alarm_alert_snooze_set">"Recurrente a los <xliff:g id="MINUTES">%d</xliff:g> minutos."</string>
     <string name="alarm_alert_snooze_not_set">"Alarma recurrente no activada. Próxima alarma fijada a las <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="alarm_set">"Esta alarma se activará en <xliff:g id="TIME_DELTA">%s</xliff:g> a partir de ahora."</string>
-    <string name="combiner">"Segmento <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">"un día"</string>
     <string name="days">"<xliff:g id="DAYS">%s</xliff:g> días"</string>
     <string name="hour">"1 hora"</string>
     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g> horas"</string>
-    <string name="and">" y "</string>
-    <string name="space">" Segmento "</string>
-    <string name="subminute">"menos de 1 minuto"</string>
     <string name="minute">"1 minuto"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> minutos"</string>
     <string name="every_day">"todos los días"</string>
index f6843a0..60d33b4 100644 (file)
     <string name="alarm_alert_snooze_text">"Posponer"</string>
     <string name="alarm_alert_snooze_set">"La alarma volverá a sonar en <xliff:g id="MINUTES">%d</xliff:g> minutos."</string>
     <string name="alarm_alert_snooze_not_set">"No se ha pospuesto la alarma, ya que la siguiente alarma sonará a las <xliff:g id="TIME">%s</xliff:g>."</string>
-    <string name="alarm_set">"La alarma sonará en <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 día"</string>
     <string name="days">"<xliff:g id="DAYS">%s</xliff:g> días"</string>
     <string name="hour">"1 hora"</string>
     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g> horas"</string>
-    <string name="and">" y "</string>
-    <string name="space">" "</string>
-    <string name="subminute">"menos de 1 minuto"</string>
     <string name="minute">"1 minuto"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> minutos"</string>
     <string name="every_day">"todos los días"</string>
index 0977be9..724f89a 100644 (file)
     <string name="alarm_alert_snooze_text">"Répéter"</string>
     <string name="alarm_alert_snooze_set">"Répétition dans <xliff:g id="MINUTES">%d</xliff:g> minutes."</string>
     <string name="alarm_alert_snooze_not_set">"Répétition non activée : prochaine alarme à <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="alarm_set">"Prochaine alarme dans <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 jour"</string>
     <string name="days">"<xliff:g id="DAYS">%s</xliff:g> jours"</string>
     <string name="hour">"1 heure"</string>
     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g> heures"</string>
-    <string name="and">" et "</string>
-    <string name="space">" "</string>
-    <string name="subminute">"moins d\'une minute"</string>
     <string name="minute">"1 minute"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> minutes"</string>
     <string name="every_day">"Tous les jours"</string>
index b098dca..e75b4d3 100644 (file)
     <string name="alarm_alert_snooze_text">"Posponi"</string>
     <string name="alarm_alert_snooze_set">"Sospensione per <xliff:g id="MINUTES">%d</xliff:g> minuti."</string>
     <string name="alarm_alert_snooze_not_set">"Sospensione non impostata. Prossimo allarme alle <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="alarm_set">"L\'allarme sarà attivato fra <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 giorno"</string>
     <string name="days">"<xliff:g id="DAYS">%s</xliff:g> giorni"</string>
     <string name="hour">"1 ora"</string>
     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g> ore"</string>
-    <string name="and">" e "</string>
-    <string name="space">" "</string>
-    <string name="subminute">"meno di 1 minuto"</string>
     <string name="minute">"1 minuto"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> minuti"</string>
     <string name="every_day">"Ogni giorno"</string>
index 9f11e6b..03e14f8 100644 (file)
     <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="hour">"1時間"</string>
     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g>時間"</string>
-    <string name="and">" と "</string>
-    <string name="space">" "</string>
-    <string name="subminute">"数十秒"</string>
     <string name="minute">"1分"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g>分"</string>
     <string name="every_day">"毎日"</string>
index 723192d..947a418 100644 (file)
     <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="hour">"1시간"</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="minute">"1분"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g>분"</string>
     <string name="every_day">"매일"</string>
index 7fe268d..5a74e53 100644 (file)
     <string name="alarm_alert_snooze_text">"Slumre"</string>
     <string name="alarm_alert_snooze_set">"Slumrer i <xliff:g id="MINUTES">%d</xliff:g> minutter."</string>
     <string name="alarm_alert_snooze_not_set">"Slumrer ikke -- neste alarm vil gå av <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="alarm_set">"Alarmen vil gå av <xliff:g id="TIME_DELTA">%s</xliff:g> fra nå."</string>
     <!-- no translation found for combiner (3170916241487451546) -->
     <skip />
     <string name="day">"en dag"</string>
     <string name="days">"<xliff:g id="DAYS">%s</xliff:g> dager"</string>
     <string name="hour">"en time"</string>
     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g> timer"</string>
-    <string name="and">" og "</string>
-    <string name="space">" "</string>
-    <string name="subminute">"mindre enn et minutt"</string>
     <string name="minute">"et minutt"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> minutter"</string>
     <string name="every_day">"hver dag"</string>
index 4c30802..86a6907 100644 (file)
     <string name="alarm_alert_snooze_text">"Snooze"</string>
     <string name="alarm_alert_snooze_set">"Snooze is ingesteld op <xliff:g id="MINUTES">%d</xliff:g> minuten."</string>
     <string name="alarm_alert_snooze_not_set">"Snooze is niet ingesteld - volgende alarm is ingesteld op <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="alarm_set">"Dit alarm is ingesteld op <xliff:g id="TIME_DELTA">%s</xliff:g> vanaf nu."</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 dag"</string>
     <string name="days">"<xliff:g id="DAYS">%s</xliff:g> dagen"</string>
     <string name="hour">"1 uur"</string>
     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g> uur"</string>
-    <string name="and">" en "</string>
-    <string name="space">" "</string>
-    <string name="subminute">"minder dan 1 minuut"</string>
     <string name="minute">"1 minuut"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> minuten"</string>
     <string name="every_day">"elke dag"</string>
index 4b702d8..67e71e4 100644 (file)
     <string name="alarm_alert_snooze_text">"Drzemka"</string>
     <string name="alarm_alert_snooze_set">"Drzemka przez <xliff:g id="MINUTES">%d</xliff:g> min."</string>
     <string name="alarm_alert_snooze_not_set">"Nie ustawiono drzemki – następny alarm: <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="alarm_set">"Ustawiony alarm zadzwoni za <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 dzień"</string>
     <string name="days">"<xliff:g id="DAYS">%s</xliff:g> dni"</string>
     <string name="hour">"1 godz."</string>
     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g> godz."</string>
-    <string name="and">" oraz "</string>
-    <string name="space">" "</string>
-    <string name="subminute">"mniej niż 1 min"</string>
     <string name="minute">"1 min"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> min"</string>
     <string name="every_day">"codziennie"</string>
index 0efd3eb..3c9285f 100644 (file)
     <string name="alarm_alert_snooze_text">"Suspender"</string>
     <string name="alarm_alert_snooze_set">"Suspenso por <xliff:g id="MINUTES">%d</xliff:g> minutos."</string>
     <string name="alarm_alert_snooze_not_set">"Suspensão não definida -- próximo alarme definido para as <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="alarm_set">"Este·alarme·dispara·daqui·a <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 dia"</string>
     <string name="days">"<xliff:g id="DAYS">%s</xliff:g> dias"</string>
     <string name="hour">"1 hora"</string>
     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g> horas"</string>
-    <string name="and">" e "</string>
-    <string name="space">" "</string>
-    <string name="subminute">"menos de 1 minuto"</string>
     <string name="minute">"1 minuto"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> minutos"</string>
     <string name="every_day">"todos os dias"</string>
index cd670b9..671e208 100644 (file)
     <string name="alarm_alert_snooze_text">"Colocar em modo de espera"</string>
     <string name="alarm_alert_snooze_set">"Em espera por <xliff:g id="MINUTES">%d</xliff:g> minutos."</string>
     <string name="alarm_alert_snooze_not_set">"Modo de espera não definido. Próximo alarme definido para <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="alarm_set">"Este alarme está definido para daqui a  <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 dia"</string>
     <string name="days">"<xliff:g id="DAYS">%s</xliff:g> dias"</string>
     <string name="hour">"1 hora"</string>
     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g> horas"</string>
-    <string name="and">" e "</string>
-    <string name="space">" "</string>
-    <string name="subminute">"menos de 1 minuto"</string>
     <string name="minute">"1 minuto"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> minutos"</string>
     <string name="every_day">"todos os dias"</string>
index 6c797e0..b1ecba8 100644 (file)
     <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="hour">"1 час"</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="minute">"1 минута"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> мин."</string>
     <string name="every_day">"каждый день"</string>
index 845f49a..83e9c22 100644 (file)
     <string name="alarm_alert_snooze_text">"Snooze"</string>
     <string name="alarm_alert_snooze_set">"Snoozar i <xliff:g id="MINUTES">%d</xliff:g> minuter."</string>
     <string name="alarm_alert_snooze_not_set">"Ingen snooze – nästa alarm ringer <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="alarm_set">"Alarmet ringer om <xliff:g id="TIME_DELTA">%s</xliff:g> från och med nu."</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 dag"</string>
     <string name="days">"<xliff:g id="DAYS">%s</xliff:g> dagar"</string>
     <string name="hour">"1 timme"</string>
     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g> timmar"</string>
-    <string name="and">" och "</string>
-    <string name="space">" "</string>
-    <string name="subminute">"mindre än 1 minut"</string>
     <string name="minute">"1 minut"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> minuter"</string>
     <string name="every_day">"Varje dag"</string>
index 63cb699..9dde70a 100644 (file)
     <string name="alarm_alert_snooze_text">"Duraklat"</string>
     <string name="alarm_alert_snooze_set">"<xliff:g id="MINUTES">%d</xliff:g> dakika duraklatılıyor."</string>
     <string name="alarm_alert_snooze_not_set">"Duraklama ayarlanmadı -- sonraki alarm <xliff:g id="TIME">%s</xliff:g> olarak ayarlandı"</string>
-    <string name="alarm_set">"Bu alarmın çalmasına şu andan itibaren <xliff:g id="TIME_DELTA">%s</xliff:g> var."</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 gün"</string>
     <string name="days">"<xliff:g id="DAYS">%s</xliff:g> gün"</string>
     <string name="hour">"1 saat"</string>
     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g> saat"</string>
-    <string name="and">" ve "</string>
-    <string name="space">" "</string>
-    <string name="subminute">"1 dakikadan az"</string>
     <string name="minute">"1 dakika"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> dakika"</string>
     <string name="every_day">"her gün"</string>
index 38f88a2..28fea35 100644 (file)
     <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="hour">"1 小时"</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="minute">"1 分钟"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> 分钟"</string>
     <string name="every_day">"每天"</string>
index 7192106..dc8724d 100644 (file)
     <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="hour">"1 小時"</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="minute">"1 分鐘"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> 分鐘"</string>
     <string name="every_day">"每天"</string>
index 5bab3e8..c7033a2 100644 (file)
          alarm set for xxx."  -->
     <string name="alarm_alert_snooze_not_set">Snooze not set -- next alarm set for <xliff:g id="time">%s</xliff:g></string>
 
+    <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    --><skip />
 
     <!-- Alarm confirmation toast: Describes how long from now until
          alarm fires -->
-    <string name="alarm_set">This alarm is set for <xliff:g id="time_delta">%s</xliff:g> from now.</string>
-
-    <!-- Alarm confirmation toast: A combiner that orders the segments
-         that follow -->
-    <string name="combiner"><xliff:g id="xxx">%1$s</xliff:g><xliff:g id="xxx">%2$s</xliff:g><xliff:g id="xxx">%3$s</xliff:g><xliff:g id="xxx">%4$s</xliff:g><xliff:g id="xxx">%5$s</xliff:g></string>
+    <string-array name="alarm_set">
+        <item>This alarm is set for less than 1 minute from now.</item>
+        <item>This alarm is set for <xliff:g id="DAYS" example="2 days">%1$s</xliff:g> from now.</item>
+        <item>This alarm is set for <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g> from now.</item>
+        <item>This alarm is set for <xliff:g id="DAYS" example="2 days">%1$s</xliff:g> and <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g> from now.</item>
+        <item>This alarm is set for <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> from now.</item>
+        <item>This alarm is set for <xliff:g id="DAYS" example="2 days">%1$s</xliff:g> and <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> from now.</item>
+        <item>This alarm is set for <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g> and <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> from now.</item>
+        <item>This alarm is set for <xliff:g id="DAYS" example="2 days">%1$s</xliff:g>, <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g>, and <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> from now.</item>
+    </string-array>
 
     <!-- Alarm confirmation toast: singular day -->
     <string name="day">"1 day"</string>
     <!-- Alarm confirmation toast: plural hours -->
     <string name="hours"><xliff:g id="hours">%s</xliff:g> hours</string>
 
-    <!-- Alarm confirmation toast: "and" to join hours and minutes -->
-    <string name="and">" and "</string>
-
-    <!-- Alarm confirmation toast: space  -->
-    <string name="space">" "</string>
-
-    <!-- Alarm confirmation toast: time less than one minute  -->
-    <string name="subminute">"less than 1 minute"</string>
-
     <!-- Alarm confirmation toast: singular minute  -->
     <string name="minute">"1 minute"</string>
 
index 807b469..c141812 100644 (file)
@@ -347,26 +347,12 @@ public class SetAlarm extends PreferenceActivity
         boolean dispHour = hours > 0;
         boolean dispMinute = minutes > 0;
 
-        String ret;
-        if (!(dispDays || dispHour || dispMinute)) {
-            ret = context.getString(R.string.subminute);
-        } else {
-            String parts[] = new String[5];
-            parts[0] = daySeq;
-            parts[1] = !dispDays ? "" :
-                    dispHour && dispMinute ? context.getString(R.string.space) :
-                    !dispHour && !dispMinute ? "" :
-                    context.getString(R.string.and);
-            parts[2] = dispHour ? hourSeq : "";
-            parts[3] = dispHour && dispMinute ? context.getString(R.string.and) : "";
-            parts[4] = dispMinute ? minSeq : "";
-            ret = context.getString(R.string.combiner, (Object[])parts);
-        }
+        int index = (dispDays ? 1 : 0) |
+                    (dispHour ? 2 : 0) |
+                    (dispMinute ? 4 : 0);
 
-        ret = context.getString(R.string.alarm_set, ret);
-        /* if (Log.LOGV) Log.v("** TOAST daySeq " + daySeq + " hourSeq " + hourSeq +
-           " minSeq " + minSeq + " ret " + ret); */
-        return ret;
+        String[] formats = context.getResources().getStringArray(R.array.alarm_set);
+        return String.format(formats[index], daySeq, hourSeq, minSeq);
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {