From 8302c5fe17b0c9e74f1c1d9941c852153516387d Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Sat, 22 May 2010 00:28:10 +0000 Subject: Wakeup alarm screen is unusuable with large fonts or small screens MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Split the description and the time on 2 lines Flyspray: FS#11274 Authors: Clément Pit--Claudel (CFP) and myself git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26244 a1c6a512-1295-4272-9138-f99709370657 --- apps/alarm_menu.c | 5 +++-- apps/lang/bulgarian.lang | 4 ++-- apps/lang/catala.lang | 4 ++-- apps/lang/chinese-simp.lang | 4 ++-- apps/lang/chinese-trad.lang | 4 ++-- apps/lang/czech.lang | 4 ++-- apps/lang/dansk.lang | 4 ++-- apps/lang/deutsch.lang | 4 ++-- apps/lang/eesti.lang | 4 ++-- apps/lang/english.lang | 4 ++-- apps/lang/espanol.lang | 4 ++-- apps/lang/esperanto.lang | 4 ++-- apps/lang/finnish.lang | 4 ++-- apps/lang/francais.lang | 4 ++-- apps/lang/galego.lang | 4 ++-- apps/lang/greek.lang | 4 ++-- apps/lang/hebrew.lang | 4 ++-- apps/lang/islenska.lang | 4 ++-- apps/lang/italiano.lang | 4 ++-- apps/lang/japanese.lang | 4 ++-- apps/lang/korean.lang | 4 ++-- apps/lang/lietuviu.lang | 4 ++-- apps/lang/magyar.lang | 4 ++-- apps/lang/nederlands.lang | 6 +++--- apps/lang/norsk-nynorsk.lang | 4 ++-- apps/lang/norsk.lang | 6 +++--- apps/lang/polski.lang | 4 ++-- apps/lang/portugues-brasileiro.lang | 4 ++-- apps/lang/portugues.lang | 4 ++-- apps/lang/romaneste.lang | 4 ++-- apps/lang/russian.lang | 4 ++-- apps/lang/slovak.lang | 4 ++-- apps/lang/slovenscina.lang | 4 ++-- apps/lang/srpski.lang | 4 ++-- apps/lang/svenska.lang | 4 ++-- apps/lang/tagalog.lang | 4 ++-- apps/lang/thai.lang | 4 ++-- apps/lang/turkce.lang | 4 ++-- apps/lang/ukrainian.lang | 4 ++-- apps/lang/wallisertitsch.lang | 4 ++-- apps/lang/walon.lang | 4 ++-- 41 files changed, 85 insertions(+), 84 deletions(-) (limited to 'apps') diff --git a/apps/alarm_menu.c b/apps/alarm_menu.c index 1cd0bc4670..b87ae2b53a 100644 --- a/apps/alarm_menu.c +++ b/apps/alarm_menu.c @@ -83,7 +83,7 @@ bool alarm_screen(void) { screens[i].set_viewport(&vp[i]); screens[i].clear_viewport(); - screens[i].puts(0, 3, str(LANG_ALARM_MOD_KEYS)); + screens[i].puts(0, 4, str(LANG_ALARM_MOD_KEYS)); } /* Talk when entering the wakeup screen */ speak_time(h, m, true, true); @@ -93,7 +93,8 @@ bool alarm_screen(void) FOR_NB_SCREENS(i) { screens[i].set_viewport(&vp[i]); - screens[i].putsf(0, 1, str(LANG_ALARM_MOD_TIME), h, m); + screens[i].putsf(0, 1, str(LANG_ALARM_MOD_TIME)); + screens[i].putsf(0, 2, "%02d:%02d", h, m); screens[i].update_viewport(); screens[i].set_viewport(NULL); } diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang index 838c67cbee..e6f815c624 100644 --- a/apps/lang/bulgarian.lang +++ b/apps/lang/bulgarian.lang @@ -9712,11 +9712,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Време на алармата: %02d:%02d" + alarm: "Време на алармата:" *: "" diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang index 7249131d46..7b5022a1f3 100644 --- a/apps/lang/catala.lang +++ b/apps/lang/catala.lang @@ -4621,11 +4621,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Hora d'Alarma: %02d:%02d" + alarm: "Hora d'Alarma:" *: none diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang index 29b12611af..3fc76cf1ea 100644 --- a/apps/lang/chinese-simp.lang +++ b/apps/lang/chinese-simp.lang @@ -4797,11 +4797,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "闹铃时间:%02d:%02d" + alarm: "闹铃时间:" *: none diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang index 1ce81a4817..c812bcef70 100644 --- a/apps/lang/chinese-trad.lang +++ b/apps/lang/chinese-trad.lang @@ -4807,11 +4807,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "鬧鈴時間: %02d:%02d" + alarm: "鬧鈴時間:" *: none diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang index 86570af311..740490e2c0 100644 --- a/apps/lang/czech.lang +++ b/apps/lang/czech.lang @@ -4661,11 +4661,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Čas buzení: %02d:%02d" + alarm: "Čas buzení:" *: none diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang index 452b5570d5..86aa8c8f91 100644 --- a/apps/lang/dansk.lang +++ b/apps/lang/dansk.lang @@ -4102,11 +4102,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Alarm tid: %02d:%02d" + alarm: "Alarm tid:" *: none diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang index 6052ed5a8d..8b7f91ae2f 100644 --- a/apps/lang/deutsch.lang +++ b/apps/lang/deutsch.lang @@ -4661,11 +4661,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Weckzeit: %02d:%02d" + alarm: "Weckzeit:" *: none diff --git a/apps/lang/eesti.lang b/apps/lang/eesti.lang index ba2be660c5..bab8788838 100644 --- a/apps/lang/eesti.lang +++ b/apps/lang/eesti.lang @@ -5275,10 +5275,10 @@ desc: The current alarm time shown in the alarm menu for the RTC alarm mod. user: core - *: "Alarm Time: %02d:%02d" + *: "Alarm Time:" - *: "Alarm Time: %02d:%02d" + *: "Alarm Time:" *: "" diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 1b386a5c90..1cf77f788e 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -4733,11 +4733,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang index 4970fc8e00..2217cf394f 100644 --- a/apps/lang/espanol.lang +++ b/apps/lang/espanol.lang @@ -3092,11 +3092,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Hora de alarma: %02d:%02d" + alarm: "Hora de alarma:" *: none diff --git a/apps/lang/esperanto.lang b/apps/lang/esperanto.lang index 0b7c25237b..2312f1a12b 100644 --- a/apps/lang/esperanto.lang +++ b/apps/lang/esperanto.lang @@ -4821,10 +4821,10 @@ desc: The current alarm time shown in the alarm menu for the RTC alarm mod. user: core - *: "Alarm Time: %02d:%02d" + *: "Alarm Time:" - *: "Alarmo Tempo: %02d:%02d" + *: "Alarmo Tempo:" *: "" diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang index e3be852af7..20850f91f5 100644 --- a/apps/lang/finnish.lang +++ b/apps/lang/finnish.lang @@ -4801,11 +4801,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Herätysaika: %02d:%02d" + alarm: "Herätysaika:" *: none diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang index 3f7c634972..0c5419b074 100644 --- a/apps/lang/francais.lang +++ b/apps/lang/francais.lang @@ -4689,11 +4689,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Heure de réveil : %02d:%02d" + alarm: "Heure de réveil :" *: none diff --git a/apps/lang/galego.lang b/apps/lang/galego.lang index d9018b0054..b5b32181f5 100644 --- a/apps/lang/galego.lang +++ b/apps/lang/galego.lang @@ -3935,10 +3935,10 @@ desc: The current alarm time shown in the alarm menu for the RTC alarm mod. user: core - *: "Alarm Time: %02d:%02d" + *: "Alarm Time:" - *: "Hora da Alarma: %02d:%02d" + *: "Hora da Alarma:" *: "" diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang index a9c2b1db8d..0828b28f94 100644 --- a/apps/lang/greek.lang +++ b/apps/lang/greek.lang @@ -4628,11 +4628,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Ώρα αφύπνισης: %02d:%02d" + alarm: "Ώρα αφύπνισης:" *: none diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang index ad98927762..e55526d478 100644 --- a/apps/lang/hebrew.lang +++ b/apps/lang/hebrew.lang @@ -4665,11 +4665,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "זמן השכמה: %02d:%02d" + alarm: "זמן השכמה:" *: none diff --git a/apps/lang/islenska.lang b/apps/lang/islenska.lang index 007a1b7778..44fab82621 100644 --- a/apps/lang/islenska.lang +++ b/apps/lang/islenska.lang @@ -4132,10 +4132,10 @@ desc: The current alarm time shown in the alarm menu for the RTC alarm mod. user: core - *: "Alarm Time: %02d:%02d" + *: "Alarm Time:" - *: "Viðvörunartími: %02d:%02d" + *: "Viðvörunartími:" *: "" diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang index b6f68099a2..e2f1418115 100644 --- a/apps/lang/italiano.lang +++ b/apps/lang/italiano.lang @@ -4658,11 +4658,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Orario sveglia: %02d:%02d" + alarm: "Orario sveglia:" *: none diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang index 494c45bd75..9e72b7647f 100644 --- a/apps/lang/japanese.lang +++ b/apps/lang/japanese.lang @@ -4663,11 +4663,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "アラーム時刻: %02d:%02d" + alarm: "アラーム時刻:" *: none diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang index 690cb106c8..526f17decd 100644 --- a/apps/lang/korean.lang +++ b/apps/lang/korean.lang @@ -4821,11 +4821,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "알람 시간: %02d:%02d" + alarm: "알람 시간:" *: none diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang index 30db27406c..df85269b38 100644 --- a/apps/lang/lietuviu.lang +++ b/apps/lang/lietuviu.lang @@ -4715,11 +4715,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Aliarmo laiaks: %02d:%02d" + alarm: "Aliarmo laiaks:" *: none diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang index 207f239e33..b6c3a53cd2 100644 --- a/apps/lang/magyar.lang +++ b/apps/lang/magyar.lang @@ -4634,11 +4634,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Ébresztés: %02d:%02d" + alarm: "Ébresztés:" *: none diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang index ce9f140645..dc88cdc0ca 100644 --- a/apps/lang/nederlands.lang +++ b/apps/lang/nederlands.lang @@ -4800,15 +4800,15 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Inschakel tijd: %02d:%02d" + alarm: "Inschakel tijd:" *: none - alarm: "Inschakel tijd: %02d:%02d" + alarm: "Inschakel tijd:" diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang index 0a8de159aa..ed24f961ca 100644 --- a/apps/lang/norsk-nynorsk.lang +++ b/apps/lang/norsk-nynorsk.lang @@ -4733,11 +4733,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Alarmklokkeslett: %02d:%02d" + alarm: "Alarmklokkeslett:" *: none diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang index 7389b4a475..35ddf922eb 100644 --- a/apps/lang/norsk.lang +++ b/apps/lang/norsk.lang @@ -4104,11 +4104,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Alarmtid: %02d:%02d" + alarm: "Alarmtid:" *: none @@ -12352,4 +12352,4 @@ *: none serial_port: "Unngå sporhopping" - \ No newline at end of file + diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang index ccea0a95a4..e218510d51 100644 --- a/apps/lang/polski.lang +++ b/apps/lang/polski.lang @@ -4664,11 +4664,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Godzina budzenia: %02d:%02d" + alarm: "Godzina budzenia:" *: none diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang index aaa7bf997c..19bb668073 100644 --- a/apps/lang/portugues-brasileiro.lang +++ b/apps/lang/portugues-brasileiro.lang @@ -4653,11 +4653,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Hora do Alarme: %02d:%02d" + alarm: "Hora do Alarme:" *: none diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang index 0006512881..277db07470 100644 --- a/apps/lang/portugues.lang +++ b/apps/lang/portugues.lang @@ -4502,11 +4502,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Hora do Alarme: %02d:%02d" + alarm: "Hora do Alarme:" *: none diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang index 8b2128d415..0b9095e421 100644 --- a/apps/lang/romaneste.lang +++ b/apps/lang/romaneste.lang @@ -1598,11 +1598,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Timp de alarma: %02d:%02d" + alarm: "Timp de alarma:" *: none diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang index e762842d33..7a30394f4f 100644 --- a/apps/lang/russian.lang +++ b/apps/lang/russian.lang @@ -4374,11 +4374,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Будильник на: %02d:%02d" + alarm: "Будильник на:" *: none diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang index 276624170e..8714fc68d8 100644 --- a/apps/lang/slovak.lang +++ b/apps/lang/slovak.lang @@ -4657,11 +4657,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Čas Budenia: %02d:%02d" + alarm: "Čas Budenia:" *: none diff --git a/apps/lang/slovenscina.lang b/apps/lang/slovenscina.lang index 2b9d89fb3c..2decc5136d 100644 --- a/apps/lang/slovenscina.lang +++ b/apps/lang/slovenscina.lang @@ -2324,10 +2324,10 @@ desc: The current alarm time shown in the alarm menu for the RTC alarm mod. user: core - *: "Alarm Time: %02d:%02d" + *: "Alarm Time:" - *: "Cas bujenja: %02d:%02d" + *: "Cas bujenja:" *: "" diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang index 9196347c80..83639a8f4e 100644 --- a/apps/lang/srpski.lang +++ b/apps/lang/srpski.lang @@ -4640,11 +4640,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Време аларма: %02d:%02d" + alarm: "Време аларма:" *: none diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang index 7730275b2a..5ce6eca3a0 100644 --- a/apps/lang/svenska.lang +++ b/apps/lang/svenska.lang @@ -4663,11 +4663,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Alarm: %02d:%02d" + alarm: "Alarm:" *: none diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang index e76a1badbc..de8df92758 100644 --- a/apps/lang/tagalog.lang +++ b/apps/lang/tagalog.lang @@ -4636,11 +4636,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Alarma oras: %02d:%02d" + alarm: "Alarma oras:" *: none diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang index 16da7d1408..e8867bd1e1 100644 --- a/apps/lang/thai.lang +++ b/apps/lang/thai.lang @@ -4622,11 +4622,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "เวลาปลุก: %02d:%02d" + alarm: "เวลาปลุก:" *: none diff --git a/apps/lang/turkce.lang b/apps/lang/turkce.lang index e8f68212a8..5c2c2566eb 100644 --- a/apps/lang/turkce.lang +++ b/apps/lang/turkce.lang @@ -11494,11 +11494,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang index 8e2397505d..51d1ad7ea8 100644 --- a/apps/lang/ukrainian.lang +++ b/apps/lang/ukrainian.lang @@ -4650,11 +4650,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Час Будильнику: %02d:%02d" + alarm: "Час Будильнику:" *: none diff --git a/apps/lang/wallisertitsch.lang b/apps/lang/wallisertitsch.lang index 33e5feb363..f7ddd70f7c 100644 --- a/apps/lang/wallisertitsch.lang +++ b/apps/lang/wallisertitsch.lang @@ -3446,10 +3446,10 @@ desc: The current alarm time shown in the alarm menu for the RTC alarm mod. user: core - *: "Alarm Time: %02d:%02d" + *: "Alarm Time:" - *: "Weckzit: %02d:%02d" + *: "Weckzit:" *: "" diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang index 72d01dac85..287e7d1d64 100644 --- a/apps/lang/walon.lang +++ b/apps/lang/walon.lang @@ -4661,11 +4661,11 @@ user: core *: none - alarm: "Alarm Time: %02d:%02d" + alarm: "Alarm Time:" *: none - alarm: "Eure do xhuflet: %02d:%02d" + alarm: "Eure do xhuflet:" *: none -- cgit