kconfig: rephrase help texts/comments not to include the package name (652cf982) · Commits · e / devices / android_kernel_xiaomi_sm6125

scripts/kconfig/conf.c

+5 −6

Original line number	Original line	Diff line number	Diff line
	@@ -508,8 +508,7 @@ int main(int ac, char **av)
	name = conf_get_configname();		name = conf_get_configname();
	if (stat(name, &tmpstat)) {		if (stat(name, &tmpstat)) {
	fprintf(stderr, _("***\n"		fprintf(stderr, _("***\n"
	"*** You have not yet configured your kernel!\n"		"*** Configuration file \"%s\" not found!\n"
	"*** (missing kernel config file \"%s\")\n"
	"***\n"		"***\n"
	"*** Please run some configurator (e.g. \"make oldconfig\" or\n"		"*** Please run some configurator (e.g. \"make oldconfig\" or\n"
	"*** \"make menuconfig\" or \"make xconfig\").\n"		"*** \"make menuconfig\" or \"make xconfig\").\n"
	@@ -571,7 +570,7 @@ int main(int ac, char **av)
	name = getenv("KCONFIG_NOSILENTUPDATE");		name = getenv("KCONFIG_NOSILENTUPDATE");
	if (name && *name) {		if (name && *name) {
	fprintf(stderr,		fprintf(stderr,
	_("\n*** Kernel configuration requires explicit update.\n\n"));		_("\n*** The configuration requires explicit update.\n\n"));
	return 1;		return 1;
	}		}
	}		}
	@@ -623,11 +622,11 @@ int main(int ac, char **av)
	* All other commands are only used to generate a config.		* All other commands are only used to generate a config.
	*/		*/
	if (conf_get_changed() && conf_write(NULL)) {		if (conf_get_changed() && conf_write(NULL)) {
	fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));		fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
	exit(1);		exit(1);
	}		}
	if (conf_write_autoconf()) {		if (conf_write_autoconf()) {
	fprintf(stderr, _("\n*** Error during update of the kernel configuration.\n\n"));		fprintf(stderr, _("\n*** Error during update of the configuration.\n\n"));
	return 1;		return 1;
	}		}
	} else if (input_mode == savedefconfig) {		} else if (input_mode == savedefconfig) {
	@@ -638,7 +637,7 @@ int main(int ac, char **av)
	}		}
	} else if (input_mode != listnewconfig) {		} else if (input_mode != listnewconfig) {
	if (conf_write(NULL)) {		if (conf_write(NULL)) {
	fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));		fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
	exit(1);		exit(1);
	}		}
	}		}

scripts/kconfig/gconf.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -671,8 +671,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data)
	{		{
	GtkWidget *dialog;		GtkWidget *dialog;
	const gchar *intro_text = _(		const gchar *intro_text = _(
	"Welcome to gkc, the GTK+ graphical kernel configuration tool\n"		"Welcome to gkc, the GTK+ graphical configuration tool\n"
	"for Linux.\n"
	"For each option, a blank box indicates the feature is disabled, a\n"		"For each option, a blank box indicates the feature is disabled, a\n"
	"check indicates it is enabled, and a dot indicates that it is to\n"		"check indicates it is enabled, and a dot indicates that it is to\n"
	"be compiled as a module. Clicking on the box will cycle through the three states.\n"		"be compiled as a module. Clicking on the box will cycle through the three states.\n"

scripts/kconfig/mconf.c

+18 −20

Original line number	Original line	Diff line number	Diff line
	@@ -25,11 +25,9 @@
	static const char mconf_readme[] = N_(		static const char mconf_readme[] = N_(
	"Overview\n"		"Overview\n"
	"--------\n"		"--------\n"
	"Some kernel features may be built directly into the kernel.\n"		"This interface let you select features and parameters for the build.\n"
	"Some may be made into loadable runtime modules. Some features\n"		"Features can either be built-in, modularized, or ignored. Parameters\n"
	"may be completely removed altogether. There are also certain\n"		"must be entered in as decimal or hexadecimal numbers or text.\n"
	"kernel parameters which are not really features, but must be\n"
	"entered in as decimal or hexadecimal numbers or possibly text.\n"
	"\n"		"\n"
	"Menu items beginning with following braces represent features that\n"		"Menu items beginning with following braces represent features that\n"
	" [ ] can be built in or removed\n"		" [ ] can be built in or removed\n"
	@@ -117,7 +115,7 @@ static const char mconf_readme[] = N_(
	"-----------------------------\n"		"-----------------------------\n"
	"Menuconfig supports the use of alternate configuration files for\n"		"Menuconfig supports the use of alternate configuration files for\n"
	"those who, for various reasons, find it necessary to switch\n"		"those who, for various reasons, find it necessary to switch\n"
	"between different kernel configurations.\n"		"between different configurations.\n"
	"\n"		"\n"
	"At the end of the main menu you will find two options. One is\n"		"At the end of the main menu you will find two options. One is\n"
	"for saving the current configuration to a file of your choosing.\n"		"for saving the current configuration to a file of your choosing.\n"
	@@ -150,9 +148,9 @@ static const char mconf_readme[] = N_(
	"\n"		"\n"
	"Optional personality available\n"		"Optional personality available\n"
	"------------------------------\n"		"------------------------------\n"
	"If you prefer to have all of the kernel options listed in a single\n"		"If you prefer to have all of the options listed in a single menu, rather\n"
	"menu, rather than the default multimenu hierarchy, run the menuconfig\n"		"than the default multimenu hierarchy, run the menuconfig with\n"
	"with MENUCONFIG_MODE environment variable set to single_menu. Example:\n"		"MENUCONFIG_MODE environment variable set to single_menu. Example:\n"
	"\n"		"\n"
	"make MENUCONFIG_MODE=single_menu menuconfig\n"		"make MENUCONFIG_MODE=single_menu menuconfig\n"
	"\n"		"\n"
	@@ -207,12 +205,12 @@ load_config_text[] = N_(
	"last retrieved. Leave blank to abort."),		"last retrieved. Leave blank to abort."),
	load_config_help[] = N_(		load_config_help[] = N_(
	"\n"		"\n"
	"For various reasons, one may wish to keep several different kernel\n"		"For various reasons, one may wish to keep several different\n"
	"configurations available on a single machine.\n"		"configurations available on a single machine.\n"
	"\n"		"\n"
	"If you have saved a previous configuration in a file other than the\n"		"If you have saved a previous configuration in a file other than the\n"
	"kernel's default, entering the name of the file here will allow you\n"		"default one, entering its name here will allow you to modify that\n"
	"to modify that configuration.\n"		"configuration.\n"
	"\n"		"\n"
	"If you are uncertain, then you have probably never used alternate\n"		"If you are uncertain, then you have probably never used alternate\n"
	"configuration files. You should therefore leave this blank to abort.\n"),		"configuration files. You should therefore leave this blank to abort.\n"),
	@@ -221,8 +219,8 @@ save_config_text[] = N_(
	"as an alternate. Leave blank to abort."),		"as an alternate. Leave blank to abort."),
	save_config_help[] = N_(		save_config_help[] = N_(
	"\n"		"\n"
	"For various reasons, one may wish to keep different kernel\n"		"For various reasons, one may wish to keep different configurations\n"
	"configurations available on a single machine.\n"		"available on a single machine.\n"
	"\n"		"\n"
	"Entering a file name here will allow you to later retrieve, modify\n"		"Entering a file name here will allow you to later retrieve, modify\n"
	"and use the current configuration as an alternate to whatever\n"		"and use the current configuration as an alternate to whatever\n"
	@@ -834,7 +832,7 @@ int main(int ac, char **av)
	if (conf_get_changed())		if (conf_get_changed())
	res = dialog_yesno(NULL,		res = dialog_yesno(NULL,
	_("Do you wish to save your "		_("Do you wish to save your "
	"new kernel configuration?\n"		"new configuration?\n"
	"<ESC><ESC> to continue."),		"<ESC><ESC> to continue."),
	6, 60);		6, 60);
	else		else
	@@ -846,20 +844,20 @@ int main(int ac, char **av)
	case 0:		case 0:
	if (conf_write(filename)) {		if (conf_write(filename)) {
	fprintf(stderr, _("\n\n"		fprintf(stderr, _("\n\n"
	"Error during writing of the kernel configuration.\n"		"Error while writing of the configuration.\n"
	"Your kernel configuration changes were NOT saved."		"Your configuration changes were NOT saved."
	"\n\n"));		"\n\n"));
	return 1;		return 1;
	}		}
	case -1:		case -1:
	printf(_("\n\n"		printf(_("\n\n"
	"*** End of Linux kernel configuration.\n"		"*** End of the configuration.\n"
	"*** Execute 'make' to build the kernel or try 'make help'."		"*** Execute 'make' to start the build or try 'make help'."
	"\n\n"));		"\n\n"));
	break;		break;
	default:		default:
	fprintf(stderr, _("\n\n"		fprintf(stderr, _("\n\n"
	"Your kernel configuration changes were NOT saved."		"Your configuration changes were NOT saved."
	"\n\n"));		"\n\n"));
	}		}

scripts/kconfig/menu.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,7 @@
	#include "lkc.h"		#include "lkc.h"

	static const char nohelp_text[] = N_(		static const char nohelp_text[] = N_(
	"There is no help available for this kernel option.\n");		"There is no help available for this option.\n");

	struct menu rootmenu;		struct menu rootmenu;
	static struct menu **last_entry_ptr;		static struct menu **last_entry_ptr;

scripts/kconfig/nconf.c

+19 −24

Original line number	Original line	Diff line number	Diff line
	@@ -15,11 +15,9 @@
	static const char nconf_readme[] = N_(		static const char nconf_readme[] = N_(
	"Overview\n"		"Overview\n"
	"--------\n"		"--------\n"
	"Some kernel features may be built directly into the kernel.\n"		"This interface let you select features and parameters for the build.\n"
	"Some may be made into loadable runtime modules. Some features\n"		"Features can either be built-in, modularized, or ignored. Parameters\n"
	"may be completely removed altogether. There are also certain\n"		"must be entered in as decimal or hexadecimal numbers or text.\n"
	"kernel parameters which are not really features, but must be\n"
	"entered in as decimal or hexadecimal numbers or possibly text.\n"
	"\n"		"\n"
	"Menu items beginning with following braces represent features that\n"		"Menu items beginning with following braces represent features that\n"
	" [ ] can be built in or removed\n"		" [ ] can be built in or removed\n"
	@@ -95,7 +93,7 @@ static const char nconf_readme[] = N_(
	"-----------------------------\n"		"-----------------------------\n"
	"nconfig supports the use of alternate configuration files for\n"		"nconfig supports the use of alternate configuration files for\n"
	"those who, for various reasons, find it necessary to switch\n"		"those who, for various reasons, find it necessary to switch\n"
	"between different kernel configurations.\n"		"between different configurations.\n"
	"\n"		"\n"
	"At the end of the main menu you will find two options. One is\n"		"At the end of the main menu you will find two options. One is\n"
	"for saving the current configuration to a file of your choosing.\n"		"for saving the current configuration to a file of your choosing.\n"
	@@ -128,9 +126,9 @@ static const char nconf_readme[] = N_(
	"\n"		"\n"
	"Optional personality available\n"		"Optional personality available\n"
	"------------------------------\n"		"------------------------------\n"
	"If you prefer to have all of the kernel options listed in a single\n"		"If you prefer to have all of the options listed in a single menu, rather\n"
	"menu, rather than the default multimenu hierarchy, run the nconfig\n"		"than the default multimenu hierarchy, run the nconfig with NCONFIG_MODE\n"
	"with NCONFIG_MODE environment variable set to single_menu. Example:\n"		"environment variable set to single_menu. Example:\n"
	"\n"		"\n"
	"make NCONFIG_MODE=single_menu nconfig\n"		"make NCONFIG_MODE=single_menu nconfig\n"
	"\n"		"\n"
	@@ -185,19 +183,19 @@ setmod_text[] = N_(
	"has been configured as a module.\n"		"has been configured as a module.\n"
	"As a result, this feature will be built as a module."),		"As a result, this feature will be built as a module."),
	nohelp_text[] = N_(		nohelp_text[] = N_(
	"There is no help available for this kernel option.\n"),		"There is no help available for this option.\n"),
	load_config_text[] = N_(		load_config_text[] = N_(
	"Enter the name of the configuration file you wish to load.\n"		"Enter the name of the configuration file you wish to load.\n"
	"Accept the name shown to restore the configuration you\n"		"Accept the name shown to restore the configuration you\n"
	"last retrieved. Leave blank to abort."),		"last retrieved. Leave blank to abort."),
	load_config_help[] = N_(		load_config_help[] = N_(
	"\n"		"\n"
	"For various reasons, one may wish to keep several different kernel\n"		"For various reasons, one may wish to keep several different\n"
	"configurations available on a single machine.\n"		"configurations available on a single machine.\n"
	"\n"		"\n"
	"If you have saved a previous configuration in a file other than the\n"		"If you have saved a previous configuration in a file other than the\n"
	"kernel's default, entering the name of the file here will allow you\n"		"default one, entering its name here will allow you to modify that\n"
	"to modify that configuration.\n"		"configuration.\n"
	"\n"		"\n"
	"If you are uncertain, then you have probably never used alternate\n"		"If you are uncertain, then you have probably never used alternate\n"
	"configuration files. You should therefor leave this blank to abort.\n"),		"configuration files. You should therefor leave this blank to abort.\n"),
	@@ -206,8 +204,8 @@ save_config_text[] = N_(
	"as an alternate. Leave blank to abort."),		"as an alternate. Leave blank to abort."),
	save_config_help[] = N_(		save_config_help[] = N_(
	"\n"		"\n"
	"For various reasons, one may wish to keep different kernel\n"		"For various reasons, one may wish to keep different configurations\n"
	"configurations available on a single machine.\n"		"available on a single machine.\n"
	"\n"		"\n"
	"Entering a file name here will allow you to later retrieve, modify\n"		"Entering a file name here will allow you to later retrieve, modify\n"
	"and use the current configuration as an alternate to whatever\n"		"and use the current configuration as an alternate to whatever\n"
	@@ -681,8 +679,7 @@ static int do_exit(void)
	return 0;		return 0;
	}		}
	res = btn_dialog(main_window,		res = btn_dialog(main_window,
	_("Do you wish to save your "		_("Do you wish to save your new configuration?\n"
	"new kernel configuration?\n"
	"<ESC> to cancel and resume nconfig."),		"<ESC> to cancel and resume nconfig."),
	2,		2,
	" <save> ",		" <save> ",
	@@ -701,18 +698,16 @@ static int do_exit(void)
	if (res)		if (res)
	btn_dialog(		btn_dialog(
	main_window,		main_window,
	_("Error during writing of the kernel "		_("Error during writing of configuration.\n"
	"configuration.\n"		"Your configuration changes were NOT saved."),
	"Your kernel configuration "
	"changes were NOT saved."),
	1,		1,
	"<OK>");		"<OK>");
	else {		else {
	char buf[1024];		char buf[1024];
	snprintf(buf, 1024,		snprintf(buf, 1024,
	_("Configuration written to %s\n"		_("Configuration written to %s\n"
	"End of Linux kernel configuration.\n"		"End of the configuration.\n"
	"Execute 'make' to build the kernel or try"		"Execute 'make' to start the build or try"
	" 'make help'."), filename);		" 'make help'."), filename);
	btn_dialog(		btn_dialog(
	main_window,		main_window,
	@@ -724,7 +719,7 @@ static int do_exit(void)
	default:		default:
	btn_dialog(		btn_dialog(
	main_window,		main_window,
	_("Your kernel configuration changes were NOT saved."),		_("Your configuration changes were NOT saved."),
	1,		1,
	"<OK>");		"<OK>");
	break;		break;