From 142725ebc9c94b1afe81c7a3d33b8175b93ef27c Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Thu, 16 Jun 2011 13:28:15 +0000 Subject: [PATCH] Fix FS#12158 - Make the "Mode: " line in the radio menu voice. Translators need to verify the voice string, dumbly copied from the dest string git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30007 a1c6a512-1295-4272-9138-f99709370657 --- apps/lang/bulgarian.lang | 2 +- apps/lang/catala.lang | 2 +- apps/lang/chinese-simp.lang | 2 +- apps/lang/chinese-trad.lang | 2 +- apps/lang/czech.lang | 2 +- apps/lang/dansk.lang | 2 +- apps/lang/deutsch.lang | 2 +- apps/lang/english.lang | 2 +- apps/lang/espanol.lang | 2 +- apps/lang/finnish.lang | 2 +- apps/lang/francais.lang | 2 +- apps/lang/galego.lang | 2 +- apps/lang/greek.lang | 2 +- apps/lang/hebrew.lang | 2 +- apps/lang/hrvatski.lang | 2 +- apps/lang/italiano.lang | 2 +- apps/lang/japanese.lang | 2 +- apps/lang/korean.lang | 2 +- apps/lang/latviesu.lang | 2 +- apps/lang/lietuviu.lang | 2 +- apps/lang/magyar.lang | 2 +- apps/lang/nederlands.lang | 2 +- apps/lang/norsk-nynorsk.lang | 2 +- apps/lang/norsk.lang | 2 +- apps/lang/polski.lang | 2 +- apps/lang/portugues-brasileiro.lang | 2 +- apps/lang/portugues.lang | 2 +- apps/lang/romaneste.lang | 2 +- apps/lang/russian.lang | 2 +- apps/lang/slovak.lang | 2 +- apps/lang/slovenscina.lang | 2 +- apps/lang/srpski.lang | 2 +- apps/lang/svenska.lang | 2 +- apps/lang/tagalog.lang | 2 +- apps/lang/thai.lang | 2 +- apps/lang/ukrainian.lang | 2 +- apps/lang/walon.lang | 2 +- apps/menus/radio_menu.c | 15 ++++++++++++++- 38 files changed, 51 insertions(+), 38 deletions(-) diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang index 590bfd8db8..b47070719e 100644 --- a/apps/lang/bulgarian.lang +++ b/apps/lang/bulgarian.lang @@ -5919,7 +5919,7 @@ *: "Режим:" - *: "" + *: "Режим:" diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang index ec79dd7d89..cb94953987 100644 --- a/apps/lang/catala.lang +++ b/apps/lang/catala.lang @@ -7881,7 +7881,7 @@ *: "Mode:" - *: "" + *: "Mode:" diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang index 25b38ac32f..5ba3c645a5 100644 --- a/apps/lang/chinese-simp.lang +++ b/apps/lang/chinese-simp.lang @@ -9019,7 +9019,7 @@ *: "模式:" - *: "" + *: "模式:" diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang index 294fb75ce5..c798f8ccfd 100644 --- a/apps/lang/chinese-trad.lang +++ b/apps/lang/chinese-trad.lang @@ -8996,7 +8996,7 @@ *: "模式:" - *: "" + *: "模式:" diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang index 6b9d12e32b..52677a89c5 100644 --- a/apps/lang/czech.lang +++ b/apps/lang/czech.lang @@ -7889,7 +7889,7 @@ *: "Mód:" - *: "Mód" + *: "Mód:" diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang index 20ebb5e58b..38bbb8edbb 100644 --- a/apps/lang/dansk.lang +++ b/apps/lang/dansk.lang @@ -9832,7 +9832,7 @@ *: "Tilstand:" - *: "" + *: "Tilstand:" diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang index 75004b44db..c8c3e7000b 100644 --- a/apps/lang/deutsch.lang +++ b/apps/lang/deutsch.lang @@ -7892,7 +7892,7 @@ *: "Modus:" - *: "" + *: "Modus:" diff --git a/apps/lang/english.lang b/apps/lang/english.lang index de2384214d..6e9dcdf7f2 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -7970,7 +7970,7 @@ *: "Mode:" - *: "" + *: "Mode:" diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang index ffad4e1766..15046f1d1b 100644 --- a/apps/lang/espanol.lang +++ b/apps/lang/espanol.lang @@ -9562,7 +9562,7 @@ *: "Modo:" - *: "" + *: "Modo:" diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang index 87a786240d..a746df1d46 100644 --- a/apps/lang/finnish.lang +++ b/apps/lang/finnish.lang @@ -9773,7 +9773,7 @@ *: "Tila:" - *: "" + *: "Tila:" diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang index 2adf811d54..7256ac6771 100644 --- a/apps/lang/francais.lang +++ b/apps/lang/francais.lang @@ -7913,7 +7913,7 @@ *: "Mode:" - *: "" + *: "Mode:" diff --git a/apps/lang/galego.lang b/apps/lang/galego.lang index 964a5fafc3..162c8f8da4 100644 --- a/apps/lang/galego.lang +++ b/apps/lang/galego.lang @@ -8974,7 +8974,7 @@ ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*, *: "Modo:" - *: "" + *: "Modo:" diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang index 06c738e38a..8814dee895 100644 --- a/apps/lang/greek.lang +++ b/apps/lang/greek.lang @@ -7858,7 +7858,7 @@ *: "Τύπος:" - *: "" + *: "Τύπος:" diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang index b6937db808..b753ce7952 100644 --- a/apps/lang/hebrew.lang +++ b/apps/lang/hebrew.lang @@ -7896,7 +7896,7 @@ *: "מצב:" - *: "" + *: "מצב:" diff --git a/apps/lang/hrvatski.lang b/apps/lang/hrvatski.lang index 1def22085f..1f31ff408f 100644 --- a/apps/lang/hrvatski.lang +++ b/apps/lang/hrvatski.lang @@ -7888,7 +7888,7 @@ *: "Način rada:" - *: "" + *: "Način rada:" diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang index fa95de5086..6f2b5dfb8b 100644 --- a/apps/lang/italiano.lang +++ b/apps/lang/italiano.lang @@ -7890,7 +7890,7 @@ *: "Modo:" - *: "" + *: "Modo:" diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang index d0b0ae8434..50b249750e 100644 --- a/apps/lang/japanese.lang +++ b/apps/lang/japanese.lang @@ -7894,7 +7894,7 @@ *: "モード:" - *: "" + *: "モード:" diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang index a0a332d65c..5ad965e27a 100644 --- a/apps/lang/korean.lang +++ b/apps/lang/korean.lang @@ -10103,7 +10103,7 @@ *: "모드:" - *: "" + *: "모드:" diff --git a/apps/lang/latviesu.lang b/apps/lang/latviesu.lang index 5be873f3ac..4c8dfa659e 100644 --- a/apps/lang/latviesu.lang +++ b/apps/lang/latviesu.lang @@ -7888,7 +7888,7 @@ *: "Režīms:" - *: "" + *: "Režīms:" diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang index d56ffe517b..5af107aa70 100644 --- a/apps/lang/lietuviu.lang +++ b/apps/lang/lietuviu.lang @@ -7946,7 +7946,7 @@ *: "Rėžimas:" - *: "" + *: "Rėžimas:" diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang index b9c388cb83..bdd7b4e0bb 100644 --- a/apps/lang/magyar.lang +++ b/apps/lang/magyar.lang @@ -7864,7 +7864,7 @@ *: "Mód:" - *: "" + *: "Mód:" diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang index 08bf3dfa81..535622a4ed 100644 --- a/apps/lang/nederlands.lang +++ b/apps/lang/nederlands.lang @@ -9785,7 +9785,7 @@ *: "Mode:" - *: "" + *: "Mode:" diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang index 0957678996..835a6bd78d 100644 --- a/apps/lang/norsk-nynorsk.lang +++ b/apps/lang/norsk-nynorsk.lang @@ -9581,7 +9581,7 @@ *: "Modus:" - *: "" + *: "Modus:" diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang index 293c4934c7..6c7a37156f 100644 --- a/apps/lang/norsk.lang +++ b/apps/lang/norsk.lang @@ -9878,7 +9878,7 @@ *: "Modus:" - *: "" + *: "Modus:" diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang index 00e1ddeaf8..65ea35f65b 100644 --- a/apps/lang/polski.lang +++ b/apps/lang/polski.lang @@ -7900,7 +7900,7 @@ *: "Tryb:" - *: "" + *: "Tryb:" diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang index 3036a79151..d397530034 100644 --- a/apps/lang/portugues-brasileiro.lang +++ b/apps/lang/portugues-brasileiro.lang @@ -7888,7 +7888,7 @@ *: "Modo:" - *: "" + *: "Modo:" diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang index f2ce99bb73..9fa86499a5 100644 --- a/apps/lang/portugues.lang +++ b/apps/lang/portugues.lang @@ -8188,7 +8188,7 @@ *: "Modo:" - *: "" + *: "Modo:" diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang index 35b136f1ab..adc031defb 100644 --- a/apps/lang/romaneste.lang +++ b/apps/lang/romaneste.lang @@ -6142,7 +6142,7 @@ *: "Mod:" - *: "" + *: "Mod:" diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang index cbe432d873..db66ee842d 100644 --- a/apps/lang/russian.lang +++ b/apps/lang/russian.lang @@ -8869,7 +8869,7 @@ *: "Режим:" - *: "" + *: "Режим:" diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang index 94a175eb15..4529efedfe 100644 --- a/apps/lang/slovak.lang +++ b/apps/lang/slovak.lang @@ -7888,7 +7888,7 @@ *: "Režim:" - *: "" + *: "Režim:" diff --git a/apps/lang/slovenscina.lang b/apps/lang/slovenscina.lang index 14ef2c98eb..de8e509b94 100644 --- a/apps/lang/slovenscina.lang +++ b/apps/lang/slovenscina.lang @@ -6970,7 +6970,7 @@ *: "Mode:" - *: "" + *: "Mode:" diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang index 179e696363..271aacdef0 100644 --- a/apps/lang/srpski.lang +++ b/apps/lang/srpski.lang @@ -7872,7 +7872,7 @@ *: "Мод:" - *: "" + *: "Мод:" diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang index 22a9539019..41499ee6fa 100644 --- a/apps/lang/svenska.lang +++ b/apps/lang/svenska.lang @@ -7891,7 +7891,7 @@ *: "Läge:" - *: "" + *: "Läge:" diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang index 816c039222..d7c329cf57 100644 --- a/apps/lang/tagalog.lang +++ b/apps/lang/tagalog.lang @@ -8227,7 +8227,7 @@ *: "Paraan:" - *: "" + *: "Paraan:" diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang index 0fceae4ca4..701886734e 100644 --- a/apps/lang/thai.lang +++ b/apps/lang/thai.lang @@ -7853,7 +7853,7 @@ *: "โหมด:" - *: "" + *: "โหมด:" diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang index d8a6c3b013..9a9e7781d1 100644 --- a/apps/lang/ukrainian.lang +++ b/apps/lang/ukrainian.lang @@ -7881,7 +7881,7 @@ *: "Режим:" - *: "" + *: "Режим:" diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang index 46b0cfb474..45fb041378 100644 --- a/apps/lang/walon.lang +++ b/apps/lang/walon.lang @@ -7892,7 +7892,7 @@ *: "Môde:" - *: "" + *: "Môde:" diff --git a/apps/menus/radio_menu.c b/apps/menus/radio_menu.c index e787aaa3e6..8ab7151c3e 100644 --- a/apps/menus/radio_menu.c +++ b/apps/menus/radio_menu.c @@ -29,6 +29,7 @@ #include "presets.h" #include "exported_menus.h" #include "sound_menu.h" /* recording_menu() */ +#include "talk.h" #ifdef HAVE_RECORDING #include "recording.h" /* recording_screen() */ @@ -108,6 +109,17 @@ static char* get_mode_text(int selected_item, void * data, char *buffer) str(LANG_RADIO_SCAN_MODE)); return buffer; } +static int mode_speak_item(int selected_item, void * data) +{ + (void)selected_item; + (void)data; + long talk_ids[4]; + talk_ids[0] = LANG_MODE; + talk_ids[1] = radio_mode ? LANG_PRESET : LANG_RADIO_SCAN_MODE; + talk_ids[2] = TALK_FINAL_ID; + talk_idarray(talk_ids, true); + return 0; +} static int toggle_radio_mode(void) { radio_mode = (radio_mode == RADIO_SCAN_MODE) ? @@ -116,7 +128,8 @@ static int toggle_radio_mode(void) } MENUITEM_FUNCTION_DYNTEXT(radio_mode_item, 0, toggle_radio_mode, NULL, - get_mode_text, NULL, NULL, NULL, Icon_NOICON); + get_mode_text, mode_speak_item, + NULL, NULL, Icon_NOICON); #endif MENUITEM_FUNCTION(scan_presets_item, MENU_FUNC_USEPARAM, -- 2.11.4.GIT