From: "Egry Gábor" <gaboregry@t-online.hu>
To: Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>
Cc: Roman Zippel <zippel@linux-m68k.org>,
Massimo Maiurana <maiurana@inwind.it>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
KernelFR <kernelfr@traduc.org>,
Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Subject: [PATCH 14/19] Kconfig I18N: menuconfig: missing macros
Date: Wed, 13 Jul 2005 19:27:32 +0200 [thread overview]
Message-ID: <1121275652.2975.41.camel@spirit> (raw)
In-Reply-To: <1121273456.2975.3.camel@spirit>
Supplementing missing macros.
Signed-off-by: Egry Gabor <gaboregry@t-online.hu>
---
scripts/kconfig/mconf.c | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff -puN scripts/kconfig/mconf.c~kconfig-i18n-14-menuconfig-missing scripts/kconfig/mconf.c
--- linux-2.6.13-rc3-i18n-kconfig/scripts/kconfig/mconf.c~kconfig-i18n-14-menuconfig-missing 2005-07-13 18:32:19.000000000 +0200
+++ linux-2.6.13-rc3-i18n-kconfig-gabaman/scripts/kconfig/mconf.c 2005-07-13 18:32:19.000000000 +0200
@@ -385,7 +385,7 @@ static void get_prompt_str(struct gstr *
str_printf(r, _(" Location:\n"));
for (j = 4; --i >= 0; j += 2) {
menu = submenu[i];
- str_printf(r, "%*c-> %s", j, ' ', menu_get_prompt(menu));
+ str_printf(r, "%*c-> %s", j, ' ', _(menu_get_prompt(menu)));
if (menu->sym) {
str_printf(r, " (%s [=%s])", menu->sym->name ?
menu->sym->name : _("<choice>"),
@@ -544,7 +544,7 @@ again:
case 0:
break;
case 1:
- show_helptext(_("Search Configuration"), search_help);
+ show_helptext(_("Search Configuration"), _(search_help));
goto again;
default:
return;
@@ -573,7 +573,7 @@ static void build_conf(struct menu *menu
prop = menu->prompt;
if (!sym) {
if (prop && menu != current_menu) {
- const char *prompt = menu_get_prompt(menu);
+ const char *prompt = _(menu_get_prompt(menu));
switch (prop->type) {
case P_MENU:
child_count++;
@@ -634,10 +634,10 @@ static void build_conf(struct menu *menu
cprint1(" ");
}
- cprint1("%*c%s", indent + 1, ' ', menu_get_prompt(menu));
+ cprint1("%*c%s", indent + 1, ' ', _(menu_get_prompt(menu)));
if (val == yes) {
if (def_menu) {
- cprint1(" (%s)", menu_get_prompt(def_menu));
+ cprint1(" (%s)", _(menu_get_prompt(def_menu)));
cprint1(" --->");
cprint_done();
if (def_menu->list) {
@@ -653,7 +653,7 @@ static void build_conf(struct menu *menu
} else {
if (menu == current_menu) {
cprint(":%p", menu);
- cprint("---%*c%s", indent + 1, ' ', menu_get_prompt(menu));
+ cprint("---%*c%s", indent + 1, ' ', _(menu_get_prompt(menu)));
goto conf_childs;
}
child_count++;
@@ -688,14 +688,14 @@ static void build_conf(struct menu *menu
tmp = indent - tmp + 4;
if (tmp < 0)
tmp = 0;
- cprint1("%*c%s%s", tmp, ' ', menu_get_prompt(menu),
+ cprint1("%*c%s%s", tmp, ' ', _(menu_get_prompt(menu)),
(sym_has_value(sym) || !sym_is_changable(sym)) ?
"" : _(" (NEW)"));
cprint_done();
goto conf_childs;
}
}
- cprint1("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu),
+ cprint1("%*c%s%s", indent + 1, ' ', _(menu_get_prompt(menu)),
(sym_has_value(sym) || !sym_is_changable(sym)) ?
"" : _(" (NEW)"));
if (menu->prompt->type == P_MENU) {
@@ -716,7 +716,7 @@ conf_childs:
static void conf(struct menu *menu)
{
struct menu *submenu;
- const char *prompt = menu_get_prompt(menu);
+ const char *prompt = _(menu_get_prompt(menu));
struct symbol *sym;
char active_entry[40];
int stat, type, i;
@@ -798,7 +798,7 @@ static void conf(struct menu *menu)
if (sym)
show_help(submenu);
else
- show_helptext("README", _(mconf_readme));
+ show_helptext(_("README"), _(mconf_readme));
break;
case 3:
if (type == 't') {
@@ -861,7 +861,7 @@ static void show_help(struct menu *menu)
str_append(&help, nohelp_text);
}
get_symbol_str(&help, sym);
- show_helptext(menu_get_prompt(menu), str_get(&help));
+ show_helptext(_(menu_get_prompt(menu)), str_get(&help));
str_free(&help);
}
@@ -882,7 +882,7 @@ static void show_file(const char *filena
static void conf_choice(struct menu *menu)
{
- const char *prompt = menu_get_prompt(menu);
+ const char *prompt = _(menu_get_prompt(menu));
struct menu *child;
struct symbol *active;
int stat;
@@ -903,7 +903,7 @@ static void conf_choice(struct menu *men
if (!menu_is_visible(child))
continue;
cprint("%p", child);
- cprint("%s", menu_get_prompt(child));
+ cprint("%s", _(menu_get_prompt(child)));
if (child->sym == sym_get_choice_value(menu->sym))
cprint("ON");
else if (child->sym == active)
@@ -934,7 +934,7 @@ static void conf_choice(struct menu *men
static void conf_string(struct menu *menu)
{
- const char *prompt = menu_get_prompt(menu);
+ const char *prompt = _(menu_get_prompt(menu));
int stat;
while (1) {
@@ -981,7 +981,7 @@ static void conf_load(void)
while (1) {
cprint_init();
cprint("--inputbox");
- cprint(load_config_text);
+ cprint(_(load_config_text));
cprint("11");
cprint("55");
cprint("%s", filename);
@@ -995,7 +995,7 @@ static void conf_load(void)
show_textbox(NULL, _("File does not exist!"), 5, 38);
break;
case 1:
- show_helptext(_("Load Alternate Configuration"), load_config_help);
+ show_helptext(_("Load Alternate Configuration"), _(load_config_help));
break;
case 255:
return;
@@ -1010,7 +1010,7 @@ static void conf_save(void)
while (1) {
cprint_init();
cprint("--inputbox");
- cprint(save_config_text);
+ cprint(_(save_config_text));
cprint("11");
cprint("55");
cprint("%s", filename);
@@ -1024,7 +1024,7 @@ static void conf_save(void)
show_textbox(NULL, _("Can't create file! Probably a nonexistent directory."), 5, 60);
break;
case 1:
- show_helptext(_("Save Alternate Configuration"), save_config_help);
+ show_helptext(_("Save Alternate Configuration"), _(save_config_help));
break;
case 255:
return;
_
next prev parent reply other threads:[~2005-07-13 17:29 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-07-13 16:50 [PATCH 0/19] Kconfig I18N completion Egry Gábor
2005-07-13 17:04 ` [PATCH 1/19] Kconfig I18N: sublocale Egry Gábor
2005-07-13 17:07 ` [PATCH 2/19] Kconfig I18N: lxdialog: width fix Egry Gábor
2005-07-13 17:26 ` [PATCH] Kconfig: lxdialog: Enable UTF8 Jan Engelhardt
2005-07-14 0:26 ` Ken Moffat
2005-07-16 9:54 ` Sam Ravnborg
2005-07-16 10:12 ` Ken Moffat
2005-07-16 22:14 ` Ken Moffat
2005-07-13 17:09 ` [PATCH 3/19] Kconfig I18N: lxdialog Egry Gábor
2005-07-13 17:11 ` [PATCH 4/19] Kconfig I18N: lxdialog: multibyte character support Egry Gábor
2005-07-14 0:10 ` Roman Zippel
2005-07-13 17:13 ` [PATCH 5/19] Kconfig I18N: lxdialog: answering Egry Gábor
2005-07-13 17:15 ` [PATCH 6/19] Kconfig I18N: config Egry Gábor
2005-07-13 17:17 ` [PATCH 7/19] Kconfig I18N: gconfig Egry Gábor
2005-07-13 17:18 ` [PATCH 8/19] Kconfig I18N: gconfig: GUI Egry Gábor
2005-07-13 17:20 ` [PATCH 9/19] Kconfig I18N: gconfig: answering Egry Gábor
2005-07-13 17:21 ` [PATCH 10/19] Kconfig I18N: gconfig: missing macros Egry Gábor
2005-07-13 17:23 ` [PATCH 11/19] Kconfig I18N: gconfig: symbol fix Egry Gábor
2005-07-13 17:24 ` [PATCH 12/19] Kconfig I18N: menuconfig Egry Gábor
2005-07-13 17:26 ` [PATCH 13/19] Kconfig I18N: menuconfig: answering Egry Gábor
2005-07-13 17:27 ` Egry Gábor [this message]
2005-07-13 17:28 ` [PATCH 15/19] Kconfig I18n: xconfig Egry Gábor
2005-07-13 17:30 ` [PATCH 16/19] Kconfig I18n: xconfig: answering Egry Gábor
2005-07-13 17:31 ` [PATCH 17/19] Kconfig I18N: xconfig: symbol fix Egry Gábor
2005-07-13 17:33 ` [PATCH 18/19] Kconfig I18N: LKC: whitespace removing Egry Gábor
2005-07-14 0:12 ` Roman Zippel
2005-07-13 17:35 ` [PATCH 19/19] Kconfig I18N: UI: Hungarian translation Egry Gábor
2005-07-13 17:41 ` [PATCH 0/19] Kconfig I18N completion Linus Torvalds
2005-07-13 18:03 ` Egry Gábor
2005-07-13 20:11 ` Sam Ravnborg
2005-07-13 18:41 ` Egry Gábor
2005-07-13 19:02 ` Linus Torvalds
2005-07-15 17:41 ` Arnaldo Carvalho de Melo
2005-07-13 20:48 ` Sam Ravnborg
2005-07-14 10:03 ` Jan Engelhardt
2005-07-13 20:04 ` Jan Engelhardt
2005-07-13 20:45 ` Sam Ravnborg
2005-07-14 3:42 ` Sam Ravnborg
2005-07-14 0:06 ` Roman Zippel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1121275652.2975.41.camel@spirit \
--to=gaboregry@t-online.hu \
--cc=acme@conectiva.com.br \
--cc=akpm@osdl.org \
--cc=kernelfr@traduc.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maiurana@inwind.it \
--cc=torvalds@osdl.org \
--cc=zippel@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®