diff options
Diffstat (limited to 'scripts/kconfig/mconf.c')
| -rw-r--r-- | scripts/kconfig/mconf.c | 141 | 
1 files changed, 68 insertions, 73 deletions
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index c829be8bb19f..5294ed159b98 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -17,12 +17,11 @@  #include <string.h>  #include <signal.h>  #include <unistd.h> -#include <locale.h>  #include "lkc.h"  #include "lxdialog/dialog.h" -static const char mconf_readme[] = N_( +static const char mconf_readme[] =  "Overview\n"  "--------\n"  "This interface lets you select features and parameters for the build.\n" @@ -171,37 +170,37 @@ static const char mconf_readme[] = N_(  " blackbg    => selects a color scheme with black background\n"  " classic    => theme with blue background. The classic look\n"  " bluetitle  => an LCD friendly version of classic. (default)\n" -"\n"), -menu_instructions[] = N_( +"\n", +menu_instructions[] =  	"Arrow keys navigate the menu.  "  	"<Enter> selects submenus ---> (or empty submenus ----).  "  	"Highlighted letters are hotkeys.  "  	"Pressing <Y> includes, <N> excludes, <M> modularizes features.  "  	"Press <Esc><Esc> to exit, <?> for Help, </> for Search.  " -	"Legend: [*] built-in  [ ] excluded  <M> module  < > module capable"), -radiolist_instructions[] = N_( +	"Legend: [*] built-in  [ ] excluded  <M> module  < > module capable", +radiolist_instructions[] =  	"Use the arrow keys to navigate this window or "  	"press the hotkey of the item you wish to select "  	"followed by the <SPACE BAR>. " -	"Press <?> for additional information about this option."), -inputbox_instructions_int[] = N_( +	"Press <?> for additional information about this option.", +inputbox_instructions_int[] =  	"Please enter a decimal value. "  	"Fractions will not be accepted.  " -	"Use the <TAB> key to move from the input field to the buttons below it."), -inputbox_instructions_hex[] = N_( +	"Use the <TAB> key to move from the input field to the buttons below it.", +inputbox_instructions_hex[] =  	"Please enter a hexadecimal value. " -	"Use the <TAB> key to move from the input field to the buttons below it."), -inputbox_instructions_string[] = N_( +	"Use the <TAB> key to move from the input field to the buttons below it.", +inputbox_instructions_string[] =  	"Please enter a string value. " -	"Use the <TAB> key to move from the input field to the buttons below it."), -setmod_text[] = N_( +	"Use the <TAB> key to move from the input field to the buttons below it.", +setmod_text[] =  	"This feature depends on another which has been configured as a module.\n" -	"As a result, this feature will be built as a module."), -load_config_text[] = N_( +	"As a result, this feature will be built as a module.", +load_config_text[] =  	"Enter the name of the configuration file you wish to load.  "  	"Accept the name shown to restore the configuration you " -	"last retrieved.  Leave blank to abort."), -load_config_help[] = N_( +	"last retrieved.  Leave blank to abort.", +load_config_help[] =  	"\n"  	"For various reasons, one may wish to keep several different\n"  	"configurations available on a single machine.\n" @@ -211,11 +210,11 @@ load_config_help[] = N_(  	"configuration.\n"  	"\n"  	"If you are uncertain, then you have probably never used alternate\n" -	"configuration files. You should therefore leave this blank to abort.\n"), -save_config_text[] = N_( +	"configuration files. You should therefore leave this blank to abort.\n", +save_config_text[] =  	"Enter a filename to which this configuration should be saved " -	"as an alternate.  Leave blank to abort."), -save_config_help[] = N_( +	"as an alternate.  Leave blank to abort.", +save_config_help[] =  	"\n"  	"For various reasons, one may wish to keep different configurations\n"  	"available on a single machine.\n" @@ -225,8 +224,8 @@ save_config_help[] = N_(  	"configuration options you have selected at that time.\n"  	"\n"  	"If you are uncertain what all this means then you should probably\n" -	"leave this blank.\n"), -search_help[] = N_( +	"leave this blank.\n", +search_help[] =  	"\n"  	"Search for symbols and display their relations.\n"  	"Regular expressions are allowed.\n" @@ -271,7 +270,7 @@ search_help[] = N_(  	"Examples: USB	=> find all symbols containing USB\n"  	"          ^USB => find all symbols starting with USB\n"  	"          USB$ => find all symbols ending with USB\n" -	"\n"); +	"\n";  static int indent;  static struct menu *current_menu; @@ -400,19 +399,19 @@ static void search_conf(void)  	struct subtitle_part stpart;  	title = str_new(); -	str_printf( &title, _("Enter (sub)string or regexp to search for " -			      "(with or without \"%s\")"), CONFIG_); +	str_printf( &title, "Enter (sub)string or regexp to search for " +			      "(with or without \"%s\")", CONFIG_);  again:  	dialog_clear(); -	dres = dialog_inputbox(_("Search Configuration Parameter"), +	dres = dialog_inputbox("Search Configuration Parameter",  			      str_get(&title),  			      10, 75, "");  	switch (dres) {  	case 0:  		break;  	case 1: -		show_helptext(_("Search Configuration"), search_help); +		show_helptext("Search Configuration", search_help);  		goto again;  	default:  		str_free(&title); @@ -443,7 +442,7 @@ again:  		res = get_relations_str(sym_arr, &head);  		set_subtitle(); -		dres = show_textbox_ext(_("Search Results"), (char *) +		dres = show_textbox_ext("Search Results", (char *)  					str_get(&res), 0, 0, keys, &vscroll,  					&hscroll, &update_text, (void *)  					&data); @@ -491,7 +490,7 @@ static void build_conf(struct menu *menu)  			switch (prop->type) {  			case P_MENU:  				child_count++; -				prompt = _(prompt); +				prompt = prompt;  				if (single_menu_mode) {  					item_make("%s%*c%s",  						  menu->data ? "-->" : "++>", @@ -508,7 +507,7 @@ static void build_conf(struct menu *menu)  			case P_COMMENT:  				if (prompt) {  					child_count++; -					item_make("   %*c*** %s ***", indent + 1, ' ', _(prompt)); +					item_make("   %*c*** %s ***", indent + 1, ' ', prompt);  					item_set_tag(':');  					item_set_data(menu);  				} @@ -516,7 +515,7 @@ static void build_conf(struct menu *menu)  			default:  				if (prompt) {  					child_count++; -					item_make("---%*c%s", indent + 1, ' ', _(prompt)); +					item_make("---%*c%s", indent + 1, ' ', prompt);  					item_set_tag(':');  					item_set_data(menu);  				} @@ -560,10 +559,10 @@ static void build_conf(struct menu *menu)  			item_set_data(menu);  		} -		item_add_str("%*c%s", indent + 1, ' ', _(menu_get_prompt(menu))); +		item_add_str("%*c%s", indent + 1, ' ', menu_get_prompt(menu));  		if (val == yes) {  			if (def_menu) { -				item_add_str(" (%s)", _(menu_get_prompt(def_menu))); +				item_add_str(" (%s)", menu_get_prompt(def_menu));  				item_add_str("  --->");  				if (def_menu->list) {  					indent += 2; @@ -575,7 +574,7 @@ static void build_conf(struct menu *menu)  		}  	} else {  		if (menu == current_menu) { -			item_make("---%*c%s", indent + 1, ' ', _(menu_get_prompt(menu))); +			item_make("---%*c%s", indent + 1, ' ', menu_get_prompt(menu));  			item_set_tag(':');  			item_set_data(menu);  			goto conf_childs; @@ -618,17 +617,17 @@ static void build_conf(struct menu *menu)  				tmp = indent - tmp + 4;  				if (tmp < 0)  					tmp = 0; -				item_add_str("%*c%s%s", tmp, ' ', _(menu_get_prompt(menu)), +				item_add_str("%*c%s%s", tmp, ' ', menu_get_prompt(menu),  					     (sym_has_value(sym) || !sym_is_changable(sym)) ? -					     "" : _(" (NEW)")); +					     "" : " (NEW)");  				item_set_tag('s');  				item_set_data(menu);  				goto conf_childs;  			}  		} -		item_add_str("%*c%s%s", indent + 1, ' ', _(menu_get_prompt(menu)), +		item_add_str("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu),  			  (sym_has_value(sym) || !sym_is_changable(sym)) ? -			  "" : _(" (NEW)")); +			  "" : " (NEW)");  		if (menu->prompt->type == P_MENU) {  			item_add_str("  %s", menu_is_empty(menu) ? "----" : "--->");  			return; @@ -665,8 +664,8 @@ static void conf(struct menu *menu, struct menu *active_menu)  			break;  		set_subtitle();  		dialog_clear(); -		res = dialog_menu(prompt ? _(prompt) : _("Main Menu"), -				  _(menu_instructions), +		res = dialog_menu(prompt ? prompt : "Main Menu", +				  menu_instructions,  				  active_menu, &s_scroll);  		if (res == 1 || res == KEY_ESC || res == -ERRDISPLAYTOOSMALL)  			break; @@ -708,7 +707,7 @@ static void conf(struct menu *menu, struct menu *active_menu)  				show_help(submenu);  			else {  				reset_subtitle(); -				show_helptext(_("README"), _(mconf_readme)); +				show_helptext("README", mconf_readme);  			}  			break;  		case 3: @@ -793,13 +792,13 @@ static void show_help(struct menu *menu)  	help.max_width = getmaxx(stdscr) - 10;  	menu_get_ext_help(menu, &help); -	show_helptext(_(menu_get_prompt(menu)), str_get(&help)); +	show_helptext(menu_get_prompt(menu), str_get(&help));  	str_free(&help);  }  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; @@ -814,9 +813,9 @@ static void conf_choice(struct menu *menu)  			if (!menu_is_visible(child))  				continue;  			if (child->sym) -				item_make("%s", _(menu_get_prompt(child))); +				item_make("%s", menu_get_prompt(child));  			else { -				item_make("*** %s ***", _(menu_get_prompt(child))); +				item_make("*** %s ***", menu_get_prompt(child));  				item_set_tag(':');  			}  			item_set_data(child); @@ -826,8 +825,8 @@ static void conf_choice(struct menu *menu)  				item_set_tag('X');  		}  		dialog_clear(); -		res = dialog_checklist(prompt ? _(prompt) : _("Main Menu"), -					_(radiolist_instructions), +		res = dialog_checklist(prompt ? prompt : "Main Menu", +					radiolist_instructions,  					MENUBOX_HEIGTH_MIN,  					MENUBOX_WIDTH_MIN,  					CHECKLIST_HEIGTH_MIN); @@ -868,26 +867,26 @@ static void conf_string(struct menu *menu)  		switch (sym_get_type(menu->sym)) {  		case S_INT: -			heading = _(inputbox_instructions_int); +			heading = inputbox_instructions_int;  			break;  		case S_HEX: -			heading = _(inputbox_instructions_hex); +			heading = inputbox_instructions_hex;  			break;  		case S_STRING: -			heading = _(inputbox_instructions_string); +			heading = inputbox_instructions_string;  			break;  		default: -			heading = _("Internal mconf error!"); +			heading = "Internal mconf error!";  		}  		dialog_clear(); -		res = dialog_inputbox(prompt ? _(prompt) : _("Main Menu"), +		res = dialog_inputbox(prompt ? prompt : "Main Menu",  				      heading, 10, 75,  				      sym_get_string_value(menu->sym));  		switch (res) {  		case 0:  			if (sym_set_string_value(menu->sym, dialog_input_result))  				return; -			show_textbox(NULL, _("You have made an invalid entry."), 5, 43); +			show_textbox(NULL, "You have made an invalid entry.", 5, 43);  			break;  		case 1:  			show_help(menu); @@ -915,10 +914,10 @@ static void conf_load(void)  				sym_set_change_count(1);  				return;  			} -			show_textbox(NULL, _("File does not exist!"), 5, 38); +			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 KEY_ESC:  			return; @@ -941,10 +940,10 @@ static void conf_save(void)  				set_config_filename(dialog_input_result);  				return;  			} -			show_textbox(NULL, _("Can't create file!  Probably a nonexistent directory."), 5, 60); +			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 KEY_ESC:  			return; @@ -961,8 +960,8 @@ static int handle_exit(void)  	dialog_clear();  	if (conf_get_changed())  		res = dialog_yesno(NULL, -				   _("Do you wish to save your new configuration?\n" -				     "(Press <ESC><ESC> to continue kernel configuration.)"), +				   "Do you wish to save your new configuration?\n" +				     "(Press <ESC><ESC> to continue kernel configuration.)",  				   6, 60);  	else  		res = -1; @@ -972,26 +971,26 @@ static int handle_exit(void)  	switch (res) {  	case 0:  		if (conf_write(filename)) { -			fprintf(stderr, _("\n\n" +			fprintf(stderr, "\n\n"  					  "Error while writing of the configuration.\n"  					  "Your configuration changes were NOT saved." -					  "\n\n")); +					  "\n\n");  			return 1;  		}  		/* fall through */  	case -1:  		if (!silent) -			printf(_("\n\n" +			printf("\n\n"  				 "*** End of the configuration.\n"  				 "*** Execute 'make' to start the build or try 'make help'." -				 "\n\n")); +				 "\n\n");  		res = 0;  		break;  	default:  		if (!silent) -			fprintf(stderr, _("\n\n" +			fprintf(stderr, "\n\n"  					  "Your configuration changes were NOT saved." -					  "\n\n")); +					  "\n\n");  		if (res != KEY_ESC)  			res = 0;  	} @@ -1009,10 +1008,6 @@ int main(int ac, char **av)  	char *mode;  	int res; -	setlocale(LC_ALL, ""); -	bindtextdomain(PACKAGE, LOCALEDIR); -	textdomain(PACKAGE); -  	signal(SIGINT, sig_handler);  	if (ac > 1 && strcmp(av[1], "-s") == 0) { @@ -1031,8 +1026,8 @@ int main(int ac, char **av)  	}  	if (init_dialog(NULL)) { -		fprintf(stderr, N_("Your display is too small to run Menuconfig!\n")); -		fprintf(stderr, N_("It must be at least 19 lines by 80 columns.\n")); +		fprintf(stderr, "Your display is too small to run Menuconfig!\n"); +		fprintf(stderr, "It must be at least 19 lines by 80 columns.\n");  		return 1;  	}  | 
