diff options
author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-11-30 22:40:32 +0000 |
---|---|---|
committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-11-30 22:40:32 +0000 |
commit | 2eaf3f850a634f44243ae484bae35bc74d40dd9f (patch) | |
tree | 0fdacb1a262ce583d2b1dd5d857e27becfdd0b8b | |
parent | be9524961dc319d2905238dcdc7e6c02ae1b0cfd (diff) | |
download | busybox-w32-2eaf3f850a634f44243ae484bae35bc74d40dd9f.tar.gz busybox-w32-2eaf3f850a634f44243ae484bae35bc74d40dd9f.tar.bz2 busybox-w32-2eaf3f850a634f44243ae484bae35bc74d40dd9f.zip |
"kernel config" -> "busybox config"
suggested by Roberto A. Foglietta <roberto.foglietta@gmail.com>
git-svn-id: svn://busybox.net/trunk/busybox@16743 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | scripts/basic/Makefile | 2 | ||||
-rw-r--r-- | scripts/kconfig/conf.c | 2 | ||||
-rw-r--r-- | scripts/kconfig/gconf.c | 2 | ||||
-rw-r--r-- | scripts/kconfig/lxdialog/BIG.FAT.WARNING | 2 | ||||
-rw-r--r-- | scripts/kconfig/mconf.c | 12 | ||||
-rw-r--r-- | scripts/kconfig/qconf.cc | 2 |
7 files changed, 12 insertions, 12 deletions
@@ -898,7 +898,7 @@ else # CONFIG_MODULES | |||
898 | 898 | ||
899 | modules modules_install: FORCE | 899 | modules modules_install: FORCE |
900 | @echo | 900 | @echo |
901 | @echo "The present kernel configuration has modules disabled." | 901 | @echo "The present busybox configuration has modules disabled." |
902 | @echo "Type 'make config' and enable loadable module support." | 902 | @echo "Type 'make config' and enable loadable module support." |
903 | @echo "Then build a kernel with module support enabled." | 903 | @echo "Then build a kernel with module support enabled." |
904 | @echo | 904 | @echo |
diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile index f22e94c3a..119f079cf 100644 --- a/scripts/basic/Makefile +++ b/scripts/basic/Makefile | |||
@@ -3,7 +3,7 @@ | |||
3 | # The programs listed herein is what is needed to do the basic stuff, | 3 | # The programs listed herein is what is needed to do the basic stuff, |
4 | # such as splitting .config and fix dependency file. | 4 | # such as splitting .config and fix dependency file. |
5 | # This initial step is needed to avoid files to be recompiled | 5 | # This initial step is needed to avoid files to be recompiled |
6 | # when kernel configuration changes (which is what happens when | 6 | # when busybox configuration changes (which is what happens when |
7 | # .config is included by main Makefile. | 7 | # .config is included by main Makefile. |
8 | # --------------------------------------------------------------------------- | 8 | # --------------------------------------------------------------------------- |
9 | # fixdep: Used to generate dependency information during build process | 9 | # fixdep: Used to generate dependency information during build process |
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 8012d1076..a95ba93e2 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
@@ -605,7 +605,7 @@ int main(int ac, char **av) | |||
605 | check_conf(&rootmenu); | 605 | check_conf(&rootmenu); |
606 | } while (conf_cnt); | 606 | } while (conf_cnt); |
607 | if (conf_write(NULL)) { | 607 | if (conf_write(NULL)) { |
608 | fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); | 608 | fprintf(stderr, _("\n*** Error during writing of the busybox configuration.\n\n")); |
609 | return 1; | 609 | return 1; |
610 | } | 610 | } |
611 | return 0; | 611 | return 0; |
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 94118b059..5aabcec23 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c | |||
@@ -741,7 +741,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data) | |||
741 | { | 741 | { |
742 | GtkWidget *dialog; | 742 | GtkWidget *dialog; |
743 | const gchar *intro_text = _( | 743 | const gchar *intro_text = _( |
744 | "Welcome to gkc, the GTK+ graphical kernel configuration tool\n" | 744 | "Welcome to gkc, the GTK+ graphical busybox configuration tool\n" |
745 | "for Linux.\n" | 745 | "for Linux.\n" |
746 | "For each option, a blank box indicates the feature is disabled, a\n" | 746 | "For each option, a blank box indicates the feature is disabled, a\n" |
747 | "check indicates it is enabled, and a dot indicates that it is to\n" | 747 | "check indicates it is enabled, and a dot indicates that it is to\n" |
diff --git a/scripts/kconfig/lxdialog/BIG.FAT.WARNING b/scripts/kconfig/lxdialog/BIG.FAT.WARNING index a8999d82b..c9bfbb902 100644 --- a/scripts/kconfig/lxdialog/BIG.FAT.WARNING +++ b/scripts/kconfig/lxdialog/BIG.FAT.WARNING | |||
@@ -1,4 +1,4 @@ | |||
1 | This is NOT the official version of dialog. This version has been | 1 | This is NOT the official version of dialog. This version has been |
2 | significantly modified from the original. It is for use by the Linux | 2 | significantly modified from the original. It is for use by the Linux |
3 | kernel configuration script. Please do not bother Savio Lam with | 3 | busybox configuration script. Please do not bother Savio Lam with |
4 | questions about this program. | 4 | questions about this program. |
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 7f973195e..31a1f4cd9 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c | |||
@@ -115,7 +115,7 @@ static const char mconf_readme[] = N_( | |||
115 | "-----------------------------\n" | 115 | "-----------------------------\n" |
116 | "Menuconfig supports the use of alternate configuration files for\n" | 116 | "Menuconfig supports the use of alternate configuration files for\n" |
117 | "those who, for various reasons, find it necessary to switch\n" | 117 | "those who, for various reasons, find it necessary to switch\n" |
118 | "between different kernel configurations.\n" | 118 | "between different busybox configurations.\n" |
119 | "\n" | 119 | "\n" |
120 | "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" |
121 | "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" |
@@ -1070,7 +1070,7 @@ int main(int ac, char **av) | |||
1070 | do { | 1070 | do { |
1071 | cprint_init(); | 1071 | cprint_init(); |
1072 | cprint("--yesno"); | 1072 | cprint("--yesno"); |
1073 | cprint(_("Do you wish to save your new kernel configuration?")); | 1073 | cprint(_("Do you wish to save your new busybox configuration?")); |
1074 | cprint("5"); | 1074 | cprint("5"); |
1075 | cprint("60"); | 1075 | cprint("60"); |
1076 | stat = exec_conf(); | 1076 | stat = exec_conf(); |
@@ -1079,18 +1079,18 @@ int main(int ac, char **av) | |||
1079 | if (stat == 0) { | 1079 | if (stat == 0) { |
1080 | if (conf_write(NULL)) { | 1080 | if (conf_write(NULL)) { |
1081 | fprintf(stderr, _("\n\n" | 1081 | fprintf(stderr, _("\n\n" |
1082 | "Error during writing of the kernel configuration.\n" | 1082 | "Error during writing of the busybox configuration.\n" |
1083 | "Your kernel configuration changes were NOT saved." | 1083 | "Your busybox configuration changes were NOT saved." |
1084 | "\n\n")); | 1084 | "\n\n")); |
1085 | return 1; | 1085 | return 1; |
1086 | } | 1086 | } |
1087 | printf(_("\n\n" | 1087 | printf(_("\n\n" |
1088 | "*** End of Linux kernel configuration.\n" | 1088 | "*** End of busybox configuration.\n" |
1089 | "*** Execute 'make' to build the kernel or try 'make help'." | 1089 | "*** Execute 'make' to build the kernel or try 'make help'." |
1090 | "\n\n")); | 1090 | "\n\n")); |
1091 | } else { | 1091 | } else { |
1092 | fprintf(stderr, _("\n\n" | 1092 | fprintf(stderr, _("\n\n" |
1093 | "Your kernel configuration changes were NOT saved." | 1093 | "Your busybox configuration changes were NOT saved." |
1094 | "\n\n")); | 1094 | "\n\n")); |
1095 | } | 1095 | } |
1096 | 1096 | ||
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 4590cd316..74b8470e8 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc | |||
@@ -1299,7 +1299,7 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e) | |||
1299 | 1299 | ||
1300 | void ConfigMainWindow::showIntro(void) | 1300 | void ConfigMainWindow::showIntro(void) |
1301 | { | 1301 | { |
1302 | static char str[] = "Welcome to the qconf graphical kernel configuration tool for Linux.\n\n" | 1302 | static char str[] = "Welcome to the qconf graphical busybox configuration tool for Linux.\n\n" |
1303 | "For each option, a blank box indicates the feature is disabled, a check\n" | 1303 | "For each option, a blank box indicates the feature is disabled, a check\n" |
1304 | "indicates it is enabled, and a dot indicates that it is to be compiled\n" | 1304 | "indicates it is enabled, and a dot indicates that it is to be compiled\n" |
1305 | "as a module. Clicking on the box will cycle through the three states.\n\n" | 1305 | "as a module. Clicking on the box will cycle through the three states.\n\n" |