diff options
| author | Alexander Levin <al.le@rockbox.org> | 2010-04-03 20:59:35 +0000 |
|---|---|---|
| committer | Alexander Levin <al.le@rockbox.org> | 2010-04-03 20:59:35 +0000 |
| commit | 8802482e3e3e7a05e2d2a12afb6f91fa56478828 (patch) | |
| tree | adda19164fe807f0c60d306005b637b0ed095554 | |
| parent | e1a1df69fc5c77bf57c5bb51ca5a084070886872 (diff) | |
| download | rockbox-8802482e3e3e7a05e2d2a12afb6f91fa56478828.zip rockbox-8802482e3e3e7a05e2d2a12afb6f91fa56478828.tar.gz rockbox-8802482e3e3e7a05e2d2a12afb6f91fa56478828.tar.bz2 rockbox-8802482e3e3e7a05e2d2a12afb6f91fa56478828.tar.xz | |
Make hotkey strings (question and confirmation) better localizable (FS#11171)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25457 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/lang/english.lang | 25 | ||||
| -rw-r--r-- | apps/onplay.c | 11 |
2 files changed, 26 insertions, 10 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index b64ab85..b4abf68 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -13395,20 +13395,37 @@ </voice> </phrase> <phrase> - id: LANG_SET_HOTKEY + id: LANG_SET_HOTKEY_QUESTION desc: hotkey splash user: core <source> *: none - hotkey: "Set Hotkey: %s" + hotkey: "Set Hotkey: %s?" </source> <dest> *: none - hotkey: "Set Hotkey: %s" + hotkey: "Set Hotkey: %s?" </dest> <voice> *: none - hotkey: "Set Hotkey: %s" + hotkey: "Set Hotkey?" + </voice> +</phrase> +<phrase> + id: LANG_HOTKEY_ASSIGNED + desc: Confirmation after the hotkey has been assigned + user: core + <source> + *: none + hotkey: "Assigned hotkey: %s" + </source> + <dest> + *: none + hotkey: "Assigned hotkey: %s" + </dest> + <voice> + *: none + hotkey: "Assigned hotkey" </voice> </phrase> <phrase> diff --git a/apps/onplay.c b/apps/onplay.c index 5a28c53..246b8af 100644 --- a/apps/onplay.c +++ b/apps/onplay.c @@ -1319,16 +1319,16 @@ static void set_hotkey(bool is_wps) if (!match_found || (this_hk == *hk_func)) return; char line1_buf[100]; - char line2_buf[101]; + char line2_buf[100]; char *line1 = line1_buf; char *line2 = line2_buf; char **line1_ptr = &line1; char **line2_ptr = &line2; - const struct text_message message={(const char **)line2_ptr, 1}; - const struct text_message yes_message={(const char **)line1_ptr, 1}; + const struct text_message message={(const char **)line1_ptr, 1}; + const struct text_message yes_message={(const char **)line2_ptr, 1}; - snprintf(line1, 100, str(LANG_SET_HOTKEY), str(this_id)); - strcat(strcpy(line2, line1), "?"); + snprintf(line1, sizeof(line1_buf), str(LANG_SET_HOTKEY_QUESTION), str(this_id)); + snprintf(line2, sizeof(line2_buf), str(LANG_HOTKEY_ASSIGNED), str(this_id)); /* confirm the hotkey setting change */ if(gui_syncyesno_run(&message, &yes_message, NULL)==YESNO_YES) @@ -1338,7 +1338,6 @@ static void set_hotkey(bool is_wps) *hk_desc = this_id; settings_save(); - splash(HZ*2, line1); } } #endif /* HOTKEY */ |