Wakeup alarm screen is unusuable with large fonts or small screens
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
diff --git a/apps/alarm_menu.c b/apps/alarm_menu.c
index 1cd0bc4..b87ae2b 100644
--- a/apps/alarm_menu.c
+++ b/apps/alarm_menu.c
@@ -83,7 +83,7 @@
{
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 @@
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 838c67c..e6f815c 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -9712,11 +9712,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Време на алармата: %02d:%02d"
+ alarm: "Време на алармата:"
</dest>
<voice>
*: ""
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang
index 7249131..7b5022a 100644
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@@ -4621,11 +4621,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Hora d'Alarma: %02d:%02d"
+ alarm: "Hora d'Alarma:"
</dest>
<voice>
*: none
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index 29b1261..3fc76cf 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -4797,11 +4797,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "闹铃时间:%02d:%02d"
+ alarm: "闹铃时间:"
</dest>
<voice>
*: none
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index 1ce81a4..c812bce 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -4807,11 +4807,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "鬧鈴時間: %02d:%02d"
+ alarm: "鬧鈴時間:"
</dest>
<voice>
*: none
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index 86570af..740490e 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -4661,11 +4661,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Čas buzení: %02d:%02d"
+ alarm: "Čas buzení:"
</dest>
<voice>
*: none
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index 452b557..86aa8c8 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -4102,11 +4102,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Alarm tid: %02d:%02d"
+ alarm: "Alarm tid:"
</dest>
<voice>
*: none
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 6052ed5..8b7f91a 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -4661,11 +4661,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Weckzeit: %02d:%02d"
+ alarm: "Weckzeit:"
</dest>
<voice>
*: none
diff --git a/apps/lang/eesti.lang b/apps/lang/eesti.lang
index ba2be66..bab8788 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
<source>
- *: "Alarm Time: %02d:%02d"
+ *: "Alarm Time:"
</source>
<dest>
- *: "Alarm Time: %02d:%02d"
+ *: "Alarm Time:"
</dest>
<voice>
*: ""
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 1b386a5..1cf77f7 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -4733,11 +4733,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</dest>
<voice>
*: none
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index 4970fc8..2217cf3 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -3092,11 +3092,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Hora de alarma: %02d:%02d"
+ alarm: "Hora de alarma:"
</dest>
<voice>
*: none
diff --git a/apps/lang/esperanto.lang b/apps/lang/esperanto.lang
index 0b7c252..2312f1a 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
<source>
- *: "Alarm Time: %02d:%02d"
+ *: "Alarm Time:"
</source>
<dest>
- *: "Alarmo Tempo: %02d:%02d"
+ *: "Alarmo Tempo:"
</dest>
<voice>
*: ""
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index e3be852..20850f9 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -4801,11 +4801,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Herätysaika: %02d:%02d"
+ alarm: "Herätysaika:"
</dest>
<voice>
*: none
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 3f7c634..0c5419b 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -4689,11 +4689,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Heure de réveil : %02d:%02d"
+ alarm: "Heure de réveil :"
</dest>
<voice>
*: none
diff --git a/apps/lang/galego.lang b/apps/lang/galego.lang
index d9018b0..b5b3218 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
<source>
- *: "Alarm Time: %02d:%02d"
+ *: "Alarm Time:"
</source>
<dest>
- *: "Hora da Alarma: %02d:%02d"
+ *: "Hora da Alarma:"
</dest>
<voice>
*: ""
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index a9c2b1d..0828b28 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -4628,11 +4628,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Ώρα αφύπνισης: %02d:%02d"
+ alarm: "Ώρα αφύπνισης:"
</dest>
<voice>
*: none
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index ad98927..e55526d 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -4665,11 +4665,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "זמן השכמה: %02d:%02d"
+ alarm: "זמן השכמה:"
</dest>
<voice>
*: none
diff --git a/apps/lang/islenska.lang b/apps/lang/islenska.lang
index 007a1b7..44fab82 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
<source>
- *: "Alarm Time: %02d:%02d"
+ *: "Alarm Time:"
</source>
<dest>
- *: "Viðvörunartími: %02d:%02d"
+ *: "Viðvörunartími:"
</dest>
<voice>
*: ""
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index b6f6809..e2f1418 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -4658,11 +4658,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Orario sveglia: %02d:%02d"
+ alarm: "Orario sveglia:"
</dest>
<voice>
*: none
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index 494c45b..9e72b76 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -4663,11 +4663,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "アラーム時刻: %02d:%02d"
+ alarm: "アラーム時刻:"
</dest>
<voice>
*: none
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index 690cb10..526f17d 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -4821,11 +4821,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "알람 시간: %02d:%02d"
+ alarm: "알람 시간:"
</dest>
<voice>
*: none
diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang
index 30db274..df85269 100644
--- a/apps/lang/lietuviu.lang
+++ b/apps/lang/lietuviu.lang
@@ -4715,11 +4715,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Aliarmo laiaks: %02d:%02d"
+ alarm: "Aliarmo laiaks:"
</dest>
<voice>
*: none
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index 207f239..b6c3a53 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -4634,11 +4634,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Ébresztés: %02d:%02d"
+ alarm: "Ébresztés:"
</dest>
<voice>
*: none
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index ce9f140..dc88cdc 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -4800,15 +4800,15 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Inschakel tijd: %02d:%02d"
+ alarm: "Inschakel tijd:"
</dest>
<voice>
*: none
- alarm: "Inschakel tijd: %02d:%02d"
+ alarm: "Inschakel tijd:"
</voice>
</phrase>
<phrase>
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang
index 0a8de15..ed24f96 100644
--- a/apps/lang/norsk-nynorsk.lang
+++ b/apps/lang/norsk-nynorsk.lang
@@ -4733,11 +4733,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Alarmklokkeslett: %02d:%02d"
+ alarm: "Alarmklokkeslett:"
</dest>
<voice>
*: none
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index 7389b4a..35ddf92 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -4104,11 +4104,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Alarmtid: %02d:%02d"
+ alarm: "Alarmtid:"
</dest>
<voice>
*: none
@@ -12352,4 +12352,4 @@
*: none
serial_port: "Unngå sporhopping"
</voice>
-</phrase>
\ No newline at end of file
+</phrase>
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index ccea0a9..e218510 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -4664,11 +4664,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Godzina budzenia: %02d:%02d"
+ alarm: "Godzina budzenia:"
</dest>
<voice>
*: none
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index aaa7bf9..19bb668 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -4653,11 +4653,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Hora do Alarme: %02d:%02d"
+ alarm: "Hora do Alarme:"
</dest>
<voice>
*: none
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index 0006512..277db07 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -4502,11 +4502,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Hora do Alarme: %02d:%02d"
+ alarm: "Hora do Alarme:"
</dest>
<voice>
*: none
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index 8b2128d..0b9095e 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -1598,11 +1598,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Timp de alarma: %02d:%02d"
+ alarm: "Timp de alarma:"
</dest>
<voice>
*: none
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index e762842..7a30394 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -4374,11 +4374,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Будильник на: %02d:%02d"
+ alarm: "Будильник на:"
</dest>
<voice>
*: none
diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang
index 2766241..8714fc6 100644
--- a/apps/lang/slovak.lang
+++ b/apps/lang/slovak.lang
@@ -4657,11 +4657,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Čas Budenia: %02d:%02d"
+ alarm: "Čas Budenia:"
</dest>
<voice>
*: none
diff --git a/apps/lang/slovenscina.lang b/apps/lang/slovenscina.lang
index 2b9d89f..2decc51 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
<source>
- *: "Alarm Time: %02d:%02d"
+ *: "Alarm Time:"
</source>
<dest>
- *: "Cas bujenja: %02d:%02d"
+ *: "Cas bujenja:"
</dest>
<voice>
*: ""
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index 9196347..83639a8 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -4640,11 +4640,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Време аларма: %02d:%02d"
+ alarm: "Време аларма:"
</dest>
<voice>
*: none
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index 7730275..5ce6eca 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -4663,11 +4663,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Alarm: %02d:%02d"
+ alarm: "Alarm:"
</dest>
<voice>
*: none
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index e76a1ba..de8df92 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -4636,11 +4636,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Alarma oras: %02d:%02d"
+ alarm: "Alarma oras:"
</dest>
<voice>
*: none
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang
index 16da7d1..e8867bd 100644
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@@ -4622,11 +4622,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "เวลาปลุก: %02d:%02d"
+ alarm: "เวลาปลุก:"
</dest>
<voice>
*: none
diff --git a/apps/lang/turkce.lang b/apps/lang/turkce.lang
index e8f6821..5c2c256 100644
--- a/apps/lang/turkce.lang
+++ b/apps/lang/turkce.lang
@@ -11494,11 +11494,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</dest>
<voice>
*: none
diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang
index 8e23975..51d1ad7 100644
--- a/apps/lang/ukrainian.lang
+++ b/apps/lang/ukrainian.lang
@@ -4650,11 +4650,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Час Будильнику: %02d:%02d"
+ alarm: "Час Будильнику:"
</dest>
<voice>
*: none
diff --git a/apps/lang/wallisertitsch.lang b/apps/lang/wallisertitsch.lang
index 33e5feb..f7ddd70 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
<source>
- *: "Alarm Time: %02d:%02d"
+ *: "Alarm Time:"
</source>
<dest>
- *: "Weckzit: %02d:%02d"
+ *: "Weckzit:"
</dest>
<voice>
*: ""
diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang
index 72d01da..287e7d1 100644
--- a/apps/lang/walon.lang
+++ b/apps/lang/walon.lang
@@ -4661,11 +4661,11 @@
user: core
<source>
*: none
- alarm: "Alarm Time: %02d:%02d"
+ alarm: "Alarm Time:"
</source>
<dest>
*: none
- alarm: "Eure do xhuflet: %02d:%02d"
+ alarm: "Eure do xhuflet:"
</dest>
<voice>
*: none