From b520bf1284e8f9d7a957b7d68e60c47afdca1a03 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Sun, 7 Nov 2010 20:21:13 +0100 Subject: [PATCH] ncurses: translatable strings must be ASCII-only add a comment at the intention of the translators to tell them they can use fancy Unicode characters since this comment is UTF-8, add --from-code=UTF-8 option to xgettext Use a macro to make DrawHelp() lines shorter Merge 'Boxes' with 'Global' help category --- modules/gui/ncurses.c | 102 ++++++++++++++++++++++-------------------- po/Makevars | 2 +- 2 files changed, 54 insertions(+), 50 deletions(-) diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index 6cb13f7861..bb197c42f3 100644 --- a/modules/gui/ncurses.c +++ b/modules/gui/ncurses.c @@ -902,71 +902,75 @@ static int DrawHelp(intf_thread_t *p_intf) intf_sys_t *p_sys = p_intf->p_sys; int l = 0; - if (p_sys->b_color) color_set(C_CATEGORY, NULL); - MainBoxWrite(p_sys, l++, _("[Display]")); - if (p_sys->b_color) color_set(C_DEFAULT, NULL); - MainBoxWrite(p_sys, l++, _(" h,H Show/Hide help box")); - MainBoxWrite(p_sys, l++, _(" i Show/Hide info box")); - MainBoxWrite(p_sys, l++, _(" m Show/Hide metadata box")); - MainBoxWrite(p_sys, l++, _(" L Show/Hide messages box")); - MainBoxWrite(p_sys, l++, _(" P Show/Hide playlist box")); - MainBoxWrite(p_sys, l++, _(" B Show/Hide filebrowser")); - MainBoxWrite(p_sys, l++, _(" x Show/Hide objects box")); - MainBoxWrite(p_sys, l++, _(" S Show/Hide statistics box")); - MainBoxWrite(p_sys, l++, _(" Esc Close Add/Search entry")); - MainBoxWrite(p_sys, l++, _(" Ctrl-l Refresh the screen")); - MainBoxWrite(p_sys, l++, ""); +#define H(a) MainBoxWrite(p_sys, l++, a) if (p_sys->b_color) color_set(C_CATEGORY, NULL); - MainBoxWrite(p_sys, l++, _("[Global]")); + H(_("[Display]")); if (p_sys->b_color) color_set(C_DEFAULT, NULL); - MainBoxWrite(p_sys, l++, _(" q, Q, Esc Quit")); - MainBoxWrite(p_sys, l++, _(" s Stop")); - MainBoxWrite(p_sys, l++, _(" Pause/Play")); - MainBoxWrite(p_sys, l++, _(" f Toggle Fullscreen")); - MainBoxWrite(p_sys, l++, _(" n, p Next/Previous playlist item")); - MainBoxWrite(p_sys, l++, _(" [, ] Next/Previous title")); - MainBoxWrite(p_sys, l++, _(" <, > Next/Previous chapter")); - MainBoxWrite(p_sys, l++, _(" ←, → Seek -/+ 1%%")); - MainBoxWrite(p_sys, l++, _(" a, z Volume Up/Down")); - MainBoxWrite(p_sys, l++, ""); + H(_(" h,H Show/Hide help box")); + H(_(" i Show/Hide info box")); + H(_(" m Show/Hide metadata box")); + H(_(" L Show/Hide messages box")); + H(_(" P Show/Hide playlist box")); + H(_(" B Show/Hide filebrowser")); + H(_(" x Show/Hide objects box")); + H(_(" S Show/Hide statistics box")); + H(_(" Esc Close Add/Search entry")); + H(_(" Ctrl-l Refresh the screen")); + H(""); if (p_sys->b_color) color_set(C_CATEGORY, NULL); - MainBoxWrite(p_sys, l++, _("[Playlist]")); + H(_("[Global]")); if (p_sys->b_color) color_set(C_DEFAULT, NULL); - MainBoxWrite(p_sys, l++, _(" r Toggle Random playing")); - MainBoxWrite(p_sys, l++, _(" l Toggle Loop Playlist")); - MainBoxWrite(p_sys, l++, _(" R Toggle Repeat item")); - MainBoxWrite(p_sys, l++, _(" o Order Playlist by title")); - MainBoxWrite(p_sys, l++, _(" O Reverse order Playlist by title")); - MainBoxWrite(p_sys, l++, _(" g Go to the current playing item")); - MainBoxWrite(p_sys, l++, _(" / Look for an item")); - MainBoxWrite(p_sys, l++, _(" A Add an entry")); - MainBoxWrite(p_sys, l++, _(" D, ⌫, Delete an entry")); - MainBoxWrite(p_sys, l++, _(" e Eject (if stopped)")); - MainBoxWrite(p_sys, l++, ""); + H(_(" q, Q, Esc Quit")); + H(_(" s Stop")); + H(_(" Pause/Play")); + H(_(" f Toggle Fullscreen")); + H(_(" n, p Next/Previous playlist item")); + H(_(" [, ] Next/Previous title")); + H(_(" <, > Next/Previous chapter")); + /* xgettext: You can use ← and → characters */ + H(_(" , Seek -/+ 1%%")); + H(_(" a, z Volume Up/Down")); + /* xgettext: You can use ↑ and ↓ characters */ + H(_(" , Navigate through the box line by line")); + /* xgettext: You can use ⇞ and ⇟ characters */ + H(_(" , Navigate through the box page by page")); + /* xgettext: You can use ↖ and ↘ characters */ + H(_(" , Navigate to start/end of box")); + H(""); if (p_sys->b_color) color_set(C_CATEGORY, NULL); - MainBoxWrite(p_sys, l++, _("[Filebrowser]")); + H(_("[Playlist]")); if (p_sys->b_color) color_set(C_DEFAULT, NULL); - MainBoxWrite(p_sys, l++, _(" Add the selected file to the playlist")); - MainBoxWrite(p_sys, l++, _(" Add the selected directory to the playlist")); - MainBoxWrite(p_sys, l++, _(" . Show/Hide hidden files")); - MainBoxWrite(p_sys, l++, ""); + H(_(" r Toggle Random playing")); + H(_(" l Toggle Loop Playlist")); + H(_(" R Toggle Repeat item")); + H(_(" o Order Playlist by title")); + H(_(" O Reverse order Playlist by title")); + H(_(" g Go to the current playing item")); + H(_(" / Look for an item")); + H(_(" A Add an entry")); + /* xgettext: You can use ⌫ character to translate */ + H(_(" D, , Delete an entry")); + H(_(" e Eject (if stopped)")); + H(""); if (p_sys->b_color) color_set(C_CATEGORY, NULL); - MainBoxWrite(p_sys, l++, _("[Boxes]")); + H(_("[Filebrowser]")); if (p_sys->b_color) color_set(C_DEFAULT, NULL); - MainBoxWrite(p_sys, l++, _(" ↑,↓ Navigate through the box line by line")); - MainBoxWrite(p_sys, l++, _(" ⇞,⇟ Navigate through the box page by page")); - MainBoxWrite(p_sys, l++, _(" ↖,↘ Navigate to start/end of box")); - MainBoxWrite(p_sys, l++, ""); + H(_(" Add the selected file to the playlist")); + H(_(" Add the selected directory to the playlist")); + H(_(" . Show/Hide hidden files")); + H(""); if (p_sys->b_color) color_set(C_CATEGORY, NULL); - MainBoxWrite(p_sys, l++, _("[Player]")); + H(_("[Player]")); if (p_sys->b_color) color_set(C_DEFAULT, NULL); - MainBoxWrite(p_sys, l++, _(" ↑,↓ Seek +/-5%%")); + /* xgettext: You can use ↑ and ↓ characters */ + H(_(" , Seek +/-5%%")); +#undef H return l; } diff --git a/po/Makevars b/po/Makevars index 65d531c56a..8781f1e6d1 100644 --- a/po/Makevars +++ b/po/Makevars @@ -10,7 +10,7 @@ subdir = po top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --directory=.. --keyword=_ --keyword=N_ --keyword=_NS --keyword=_ANS --keyword=qtr --keyword=Q_ --language=C++ --keyword=vlc_pgettext:1c,2 --add-comments=xgettext: +XGETTEXT_OPTIONS = --directory=.. --keyword=_ --keyword=N_ --keyword=_NS --keyword=_ANS --keyword=qtr --keyword=Q_ --language=C++ --keyword=vlc_pgettext:1c,2 --add-comments=xgettext: --from-code=UTF-8 # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding -- 2.39.2