diff options
author | Arnaud Lacombe <lacombar@gmail.com> | 2010-08-14 23:51:40 -0400 |
---|---|---|
committer | Arnaud Lacombe <lacombar@gmail.com> | 2010-09-19 18:19:30 -0400 |
commit | 652cf9821d2a5b22a1725ce8dc235ea5de0e1c6f (patch) | |
tree | 26def63047085a3a08b2c72104753f7cebf41540 /scripts/kconfig | |
parent | ffb5957bc48f64f0773fd3fbc43cb9bb9b38e270 (diff) |
kconfig: rephrase help texts/comments not to include the package name
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Reviewed-by: Randy Dunlap <rdunlap@xenotime.net>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/kconfig')
-rw-r--r-- | scripts/kconfig/conf.c | 11 | ||||
-rw-r--r-- | scripts/kconfig/gconf.c | 3 | ||||
-rw-r--r-- | scripts/kconfig/mconf.c | 38 | ||||
-rw-r--r-- | scripts/kconfig/menu.c | 2 | ||||
-rw-r--r-- | scripts/kconfig/nconf.c | 43 | ||||
-rw-r--r-- | scripts/kconfig/qconf.cc | 2 |
6 files changed, 45 insertions, 54 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index d6cfa0ffbaf0..eba5906dc4ab 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
@@ -508,8 +508,7 @@ int main(int ac, char **av) | |||
508 | name = conf_get_configname(); | 508 | name = conf_get_configname(); |
509 | if (stat(name, &tmpstat)) { | 509 | if (stat(name, &tmpstat)) { |
510 | fprintf(stderr, _("***\n" | 510 | fprintf(stderr, _("***\n" |
511 | "*** You have not yet configured your kernel!\n" | 511 | "*** Configuration file \"%s\" not found!\n" |
512 | "*** (missing kernel config file \"%s\")\n" | ||
513 | "***\n" | 512 | "***\n" |
514 | "*** Please run some configurator (e.g. \"make oldconfig\" or\n" | 513 | "*** Please run some configurator (e.g. \"make oldconfig\" or\n" |
515 | "*** \"make menuconfig\" or \"make xconfig\").\n" | 514 | "*** \"make menuconfig\" or \"make xconfig\").\n" |
@@ -571,7 +570,7 @@ int main(int ac, char **av) | |||
571 | name = getenv("KCONFIG_NOSILENTUPDATE"); | 570 | name = getenv("KCONFIG_NOSILENTUPDATE"); |
572 | if (name && *name) { | 571 | if (name && *name) { |
573 | fprintf(stderr, | 572 | fprintf(stderr, |
574 | _("\n*** Kernel configuration requires explicit update.\n\n")); | 573 | _("\n*** The configuration requires explicit update.\n\n")); |
575 | return 1; | 574 | return 1; |
576 | } | 575 | } |
577 | } | 576 | } |
@@ -623,11 +622,11 @@ int main(int ac, char **av) | |||
623 | * All other commands are only used to generate a config. | 622 | * All other commands are only used to generate a config. |
624 | */ | 623 | */ |
625 | if (conf_get_changed() && conf_write(NULL)) { | 624 | if (conf_get_changed() && conf_write(NULL)) { |
626 | fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); | 625 | fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n")); |
627 | exit(1); | 626 | exit(1); |
628 | } | 627 | } |
629 | if (conf_write_autoconf()) { | 628 | if (conf_write_autoconf()) { |
630 | fprintf(stderr, _("\n*** Error during update of the kernel configuration.\n\n")); | 629 | fprintf(stderr, _("\n*** Error during update of the configuration.\n\n")); |
631 | return 1; | 630 | return 1; |
632 | } | 631 | } |
633 | } else if (input_mode == savedefconfig) { | 632 | } else if (input_mode == savedefconfig) { |
@@ -638,7 +637,7 @@ int main(int ac, char **av) | |||
638 | } | 637 | } |
639 | } else if (input_mode != listnewconfig) { | 638 | } else if (input_mode != listnewconfig) { |
640 | if (conf_write(NULL)) { | 639 | if (conf_write(NULL)) { |
641 | fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); | 640 | fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n")); |
642 | exit(1); | 641 | exit(1); |
643 | } | 642 | } |
644 | } | 643 | } |
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index d66988265f89..16362139d52a 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c | |||
@@ -671,8 +671,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data) | |||
671 | { | 671 | { |
672 | GtkWidget *dialog; | 672 | GtkWidget *dialog; |
673 | const gchar *intro_text = _( | 673 | const gchar *intro_text = _( |
674 | "Welcome to gkc, the GTK+ graphical kernel configuration tool\n" | 674 | "Welcome to gkc, the GTK+ graphical configuration tool\n" |
675 | "for Linux.\n" | ||
676 | "For each option, a blank box indicates the feature is disabled, a\n" | 675 | "For each option, a blank box indicates the feature is disabled, a\n" |
677 | "check indicates it is enabled, and a dot indicates that it is to\n" | 676 | "check indicates it is enabled, and a dot indicates that it is to\n" |
678 | "be compiled as a module. Clicking on the box will cycle through the three states.\n" | 677 | "be compiled as a module. Clicking on the box will cycle through the three states.\n" |
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 17ba2227932d..cee4281ad209 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c | |||
@@ -25,11 +25,9 @@ | |||
25 | static const char mconf_readme[] = N_( | 25 | static const char mconf_readme[] = N_( |
26 | "Overview\n" | 26 | "Overview\n" |
27 | "--------\n" | 27 | "--------\n" |
28 | "Some kernel features may be built directly into the kernel.\n" | 28 | "This interface let you select features and parameters for the build.\n" |
29 | "Some may be made into loadable runtime modules. Some features\n" | 29 | "Features can either be built-in, modularized, or ignored. Parameters\n" |
30 | "may be completely removed altogether. There are also certain\n" | 30 | "must be entered in as decimal or hexadecimal numbers or text.\n" |
31 | "kernel parameters which are not really features, but must be\n" | ||
32 | "entered in as decimal or hexadecimal numbers or possibly text.\n" | ||
33 | "\n" | 31 | "\n" |
34 | "Menu items beginning with following braces represent features that\n" | 32 | "Menu items beginning with following braces represent features that\n" |
35 | " [ ] can be built in or removed\n" | 33 | " [ ] can be built in or removed\n" |
@@ -117,7 +115,7 @@ static const char mconf_readme[] = N_( | |||
117 | "-----------------------------\n" | 115 | "-----------------------------\n" |
118 | "Menuconfig supports the use of alternate configuration files for\n" | 116 | "Menuconfig supports the use of alternate configuration files for\n" |
119 | "those who, for various reasons, find it necessary to switch\n" | 117 | "those who, for various reasons, find it necessary to switch\n" |
120 | "between different kernel configurations.\n" | 118 | "between different configurations.\n" |
121 | "\n" | 119 | "\n" |
122 | "At the end of the main menu you will find two options. One is\n" | 120 | "At the end of the main menu you will find two options. One is\n" |
123 | "for saving the current configuration to a file of your choosing.\n" | 121 | "for saving the current configuration to a file of your choosing.\n" |
@@ -150,9 +148,9 @@ static const char mconf_readme[] = N_( | |||
150 | "\n" | 148 | "\n" |
151 | "Optional personality available\n" | 149 | "Optional personality available\n" |
152 | "------------------------------\n" | 150 | "------------------------------\n" |
153 | "If you prefer to have all of the kernel options listed in a single\n" | 151 | "If you prefer to have all of the options listed in a single menu, rather\n" |
154 | "menu, rather than the default multimenu hierarchy, run the menuconfig\n" | 152 | "than the default multimenu hierarchy, run the menuconfig with\n" |
155 | "with MENUCONFIG_MODE environment variable set to single_menu. Example:\n" | 153 | "MENUCONFIG_MODE environment variable set to single_menu. Example:\n" |
156 | "\n" | 154 | "\n" |
157 | "make MENUCONFIG_MODE=single_menu menuconfig\n" | 155 | "make MENUCONFIG_MODE=single_menu menuconfig\n" |
158 | "\n" | 156 | "\n" |
@@ -207,12 +205,12 @@ load_config_text[] = N_( | |||
207 | "last retrieved. Leave blank to abort."), | 205 | "last retrieved. Leave blank to abort."), |
208 | load_config_help[] = N_( | 206 | load_config_help[] = N_( |
209 | "\n" | 207 | "\n" |
210 | "For various reasons, one may wish to keep several different kernel\n" | 208 | "For various reasons, one may wish to keep several different\n" |
211 | "configurations available on a single machine.\n" | 209 | "configurations available on a single machine.\n" |
212 | "\n" | 210 | "\n" |
213 | "If you have saved a previous configuration in a file other than the\n" | 211 | "If you have saved a previous configuration in a file other than the\n" |
214 | "kernel's default, entering the name of the file here will allow you\n" | 212 | "default one, entering its name here will allow you to modify that\n" |
215 | "to modify that configuration.\n" | 213 | "configuration.\n" |
216 | "\n" | 214 | "\n" |
217 | "If you are uncertain, then you have probably never used alternate\n" | 215 | "If you are uncertain, then you have probably never used alternate\n" |
218 | "configuration files. You should therefore leave this blank to abort.\n"), | 216 | "configuration files. You should therefore leave this blank to abort.\n"), |
@@ -221,8 +219,8 @@ save_config_text[] = N_( | |||
221 | "as an alternate. Leave blank to abort."), | 219 | "as an alternate. Leave blank to abort."), |
222 | save_config_help[] = N_( | 220 | save_config_help[] = N_( |
223 | "\n" | 221 | "\n" |
224 | "For various reasons, one may wish to keep different kernel\n" | 222 | "For various reasons, one may wish to keep different configurations\n" |
225 | "configurations available on a single machine.\n" | 223 | "available on a single machine.\n" |
226 | "\n" | 224 | "\n" |
227 | "Entering a file name here will allow you to later retrieve, modify\n" | 225 | "Entering a file name here will allow you to later retrieve, modify\n" |
228 | "and use the current configuration as an alternate to whatever\n" | 226 | "and use the current configuration as an alternate to whatever\n" |
@@ -834,7 +832,7 @@ int main(int ac, char **av) | |||
834 | if (conf_get_changed()) | 832 | if (conf_get_changed()) |
835 | res = dialog_yesno(NULL, | 833 | res = dialog_yesno(NULL, |
836 | _("Do you wish to save your " | 834 | _("Do you wish to save your " |
837 | "new kernel configuration?\n" | 835 | "new configuration?\n" |
838 | "<ESC><ESC> to continue."), | 836 | "<ESC><ESC> to continue."), |
839 | 6, 60); | 837 | 6, 60); |
840 | else | 838 | else |
@@ -846,20 +844,20 @@ int main(int ac, char **av) | |||
846 | case 0: | 844 | case 0: |
847 | if (conf_write(filename)) { | 845 | if (conf_write(filename)) { |
848 | fprintf(stderr, _("\n\n" | 846 | fprintf(stderr, _("\n\n" |
849 | "Error during writing of the kernel configuration.\n" | 847 | "Error while writing of the configuration.\n" |
850 | "Your kernel configuration changes were NOT saved." | 848 | "Your configuration changes were NOT saved." |
851 | "\n\n")); | 849 | "\n\n")); |
852 | return 1; | 850 | return 1; |
853 | } | 851 | } |
854 | case -1: | 852 | case -1: |
855 | printf(_("\n\n" | 853 | printf(_("\n\n" |
856 | "*** End of Linux kernel configuration.\n" | 854 | "*** End of the configuration.\n" |
857 | "*** Execute 'make' to build the kernel or try 'make help'." | 855 | "*** Execute 'make' to start the build or try 'make help'." |
858 | "\n\n")); | 856 | "\n\n")); |
859 | break; | 857 | break; |
860 | default: | 858 | default: |
861 | fprintf(stderr, _("\n\n" | 859 | fprintf(stderr, _("\n\n" |
862 | "Your kernel configuration changes were NOT saved." | 860 | "Your configuration changes were NOT saved." |
863 | "\n\n")); | 861 | "\n\n")); |
864 | } | 862 | } |
865 | 863 | ||
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 64da30c76894..682045a7aae4 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c | |||
@@ -10,7 +10,7 @@ | |||
10 | #include "lkc.h" | 10 | #include "lkc.h" |
11 | 11 | ||
12 | static const char nohelp_text[] = N_( | 12 | static const char nohelp_text[] = N_( |
13 | "There is no help available for this kernel option.\n"); | 13 | "There is no help available for this option.\n"); |
14 | 14 | ||
15 | struct menu rootmenu; | 15 | struct menu rootmenu; |
16 | static struct menu **last_entry_ptr; | 16 | static struct menu **last_entry_ptr; |
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index da5e45d43f15..801cc048704a 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c | |||
@@ -15,11 +15,9 @@ | |||
15 | static const char nconf_readme[] = N_( | 15 | static const char nconf_readme[] = N_( |
16 | "Overview\n" | 16 | "Overview\n" |
17 | "--------\n" | 17 | "--------\n" |
18 | "Some kernel features may be built directly into the kernel.\n" | 18 | "This interface let you select features and parameters for the build.\n" |
19 | "Some may be made into loadable runtime modules. Some features\n" | 19 | "Features can either be built-in, modularized, or ignored. Parameters\n" |
20 | "may be completely removed altogether. There are also certain\n" | 20 | "must be entered in as decimal or hexadecimal numbers or text.\n" |
21 | "kernel parameters which are not really features, but must be\n" | ||
22 | "entered in as decimal or hexadecimal numbers or possibly text.\n" | ||
23 | "\n" | 21 | "\n" |
24 | "Menu items beginning with following braces represent features that\n" | 22 | "Menu items beginning with following braces represent features that\n" |
25 | " [ ] can be built in or removed\n" | 23 | " [ ] can be built in or removed\n" |
@@ -95,7 +93,7 @@ static const char nconf_readme[] = N_( | |||
95 | "-----------------------------\n" | 93 | "-----------------------------\n" |
96 | "nconfig supports the use of alternate configuration files for\n" | 94 | "nconfig supports the use of alternate configuration files for\n" |
97 | "those who, for various reasons, find it necessary to switch\n" | 95 | "those who, for various reasons, find it necessary to switch\n" |
98 | "between different kernel configurations.\n" | 96 | "between different configurations.\n" |
99 | "\n" | 97 | "\n" |
100 | "At the end of the main menu you will find two options. One is\n" | 98 | "At the end of the main menu you will find two options. One is\n" |
101 | "for saving the current configuration to a file of your choosing.\n" | 99 | "for saving the current configuration to a file of your choosing.\n" |
@@ -128,9 +126,9 @@ static const char nconf_readme[] = N_( | |||
128 | "\n" | 126 | "\n" |
129 | "Optional personality available\n" | 127 | "Optional personality available\n" |
130 | "------------------------------\n" | 128 | "------------------------------\n" |
131 | "If you prefer to have all of the kernel options listed in a single\n" | 129 | "If you prefer to have all of the options listed in a single menu, rather\n" |
132 | "menu, rather than the default multimenu hierarchy, run the nconfig\n" | 130 | "than the default multimenu hierarchy, run the nconfig with NCONFIG_MODE\n" |
133 | "with NCONFIG_MODE environment variable set to single_menu. Example:\n" | 131 | "environment variable set to single_menu. Example:\n" |
134 | "\n" | 132 | "\n" |
135 | "make NCONFIG_MODE=single_menu nconfig\n" | 133 | "make NCONFIG_MODE=single_menu nconfig\n" |
136 | "\n" | 134 | "\n" |
@@ -185,19 +183,19 @@ setmod_text[] = N_( | |||
185 | "has been configured as a module.\n" | 183 | "has been configured as a module.\n" |
186 | "As a result, this feature will be built as a module."), | 184 | "As a result, this feature will be built as a module."), |
187 | nohelp_text[] = N_( | 185 | nohelp_text[] = N_( |
188 | "There is no help available for this kernel option.\n"), | 186 | "There is no help available for this option.\n"), |
189 | load_config_text[] = N_( | 187 | load_config_text[] = N_( |
190 | "Enter the name of the configuration file you wish to load.\n" | 188 | "Enter the name of the configuration file you wish to load.\n" |
191 | "Accept the name shown to restore the configuration you\n" | 189 | "Accept the name shown to restore the configuration you\n" |
192 | "last retrieved. Leave blank to abort."), | 190 | "last retrieved. Leave blank to abort."), |
193 | load_config_help[] = N_( | 191 | load_config_help[] = N_( |
194 | "\n" | 192 | "\n" |
195 | "For various reasons, one may wish to keep several different kernel\n" | 193 | "For various reasons, one may wish to keep several different\n" |
196 | "configurations available on a single machine.\n" | 194 | "configurations available on a single machine.\n" |
197 | "\n" | 195 | "\n" |
198 | "If you have saved a previous configuration in a file other than the\n" | 196 | "If you have saved a previous configuration in a file other than the\n" |
199 | "kernel's default, entering the name of the file here will allow you\n" | 197 | "default one, entering its name here will allow you to modify that\n" |
200 | "to modify that configuration.\n" | 198 | "configuration.\n" |
201 | "\n" | 199 | "\n" |
202 | "If you are uncertain, then you have probably never used alternate\n" | 200 | "If you are uncertain, then you have probably never used alternate\n" |
203 | "configuration files. You should therefor leave this blank to abort.\n"), | 201 | "configuration files. You should therefor leave this blank to abort.\n"), |
@@ -206,8 +204,8 @@ save_config_text[] = N_( | |||
206 | "as an alternate. Leave blank to abort."), | 204 | "as an alternate. Leave blank to abort."), |
207 | save_config_help[] = N_( | 205 | save_config_help[] = N_( |
208 | "\n" | 206 | "\n" |
209 | "For various reasons, one may wish to keep different kernel\n" | 207 | "For various reasons, one may wish to keep different configurations\n" |
210 | "configurations available on a single machine.\n" | 208 | "available on a single machine.\n" |
211 | "\n" | 209 | "\n" |
212 | "Entering a file name here will allow you to later retrieve, modify\n" | 210 | "Entering a file name here will allow you to later retrieve, modify\n" |
213 | "and use the current configuration as an alternate to whatever\n" | 211 | "and use the current configuration as an alternate to whatever\n" |
@@ -681,8 +679,7 @@ static int do_exit(void) | |||
681 | return 0; | 679 | return 0; |
682 | } | 680 | } |
683 | res = btn_dialog(main_window, | 681 | res = btn_dialog(main_window, |
684 | _("Do you wish to save your " | 682 | _("Do you wish to save your new configuration?\n" |
685 | "new kernel configuration?\n" | ||
686 | "<ESC> to cancel and resume nconfig."), | 683 | "<ESC> to cancel and resume nconfig."), |
687 | 2, | 684 | 2, |
688 | " <save> ", | 685 | " <save> ", |
@@ -701,18 +698,16 @@ static int do_exit(void) | |||
701 | if (res) | 698 | if (res) |
702 | btn_dialog( | 699 | btn_dialog( |
703 | main_window, | 700 | main_window, |
704 | _("Error during writing of the kernel " | 701 | _("Error during writing of configuration.\n" |
705 | "configuration.\n" | 702 | "Your configuration changes were NOT saved."), |
706 | "Your kernel configuration " | ||
707 | "changes were NOT saved."), | ||
708 | 1, | 703 | 1, |
709 | "<OK>"); | 704 | "<OK>"); |
710 | else { | 705 | else { |
711 | char buf[1024]; | 706 | char buf[1024]; |
712 | snprintf(buf, 1024, | 707 | snprintf(buf, 1024, |
713 | _("Configuration written to %s\n" | 708 | _("Configuration written to %s\n" |
714 | "End of Linux kernel configuration.\n" | 709 | "End of the configuration.\n" |
715 | "Execute 'make' to build the kernel or try" | 710 | "Execute 'make' to start the build or try" |
716 | " 'make help'."), filename); | 711 | " 'make help'."), filename); |
717 | btn_dialog( | 712 | btn_dialog( |
718 | main_window, | 713 | main_window, |
@@ -724,7 +719,7 @@ static int do_exit(void) | |||
724 | default: | 719 | default: |
725 | btn_dialog( | 720 | btn_dialog( |
726 | main_window, | 721 | main_window, |
727 | _("Your kernel configuration changes were NOT saved."), | 722 | _("Your configuration changes were NOT saved."), |
728 | 1, | 723 | 1, |
729 | "<OK>"); | 724 | "<OK>"); |
730 | break; | 725 | break; |
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index a04e4517ead1..fe18f7efdca1 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc | |||
@@ -1655,7 +1655,7 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e) | |||
1655 | 1655 | ||
1656 | void ConfigMainWindow::showIntro(void) | 1656 | void ConfigMainWindow::showIntro(void) |
1657 | { | 1657 | { |
1658 | static const QString str = _("Welcome to the qconf graphical kernel configuration tool for Linux.\n\n" | 1658 | static const QString str = _("Welcome to the qconf graphical configuration tool.\n\n" |
1659 | "For each option, a blank box indicates the feature is disabled, a check\n" | 1659 | "For each option, a blank box indicates the feature is disabled, a check\n" |
1660 | "indicates it is enabled, and a dot indicates that it is to be compiled\n" | 1660 | "indicates it is enabled, and a dot indicates that it is to be compiled\n" |
1661 | "as a module. Clicking on the box will cycle through the three states.\n\n" | 1661 | "as a module. Clicking on the box will cycle through the three states.\n\n" |