svn commit: trunk/busybox/scripts/kconfig: lxdialog

vda at busybox.net vda at busybox.net
Wed May 28 11:59:33 UTC 2008


Author: vda
Date: 2008-05-28 04:59:32 -0700 (Wed, 28 May 2008)
New Revision: 22102

Log:
Remove 'busybox' word from configuration programs
(based on experience of adapting it to uclibc).



Modified:
   trunk/busybox/scripts/kconfig/conf.c
   trunk/busybox/scripts/kconfig/confdata.c
   trunk/busybox/scripts/kconfig/gconf.c
   trunk/busybox/scripts/kconfig/lxdialog/BIG.FAT.WARNING
   trunk/busybox/scripts/kconfig/mconf.c
   trunk/busybox/scripts/kconfig/qconf.cc


Changeset:
Modified: trunk/busybox/scripts/kconfig/conf.c
===================================================================
--- trunk/busybox/scripts/kconfig/conf.c	2008-05-28 11:40:29 UTC (rev 22101)
+++ trunk/busybox/scripts/kconfig/conf.c	2008-05-28 11:59:32 UTC (rev 22102)
@@ -605,7 +605,7 @@
 		check_conf(&rootmenu);
 	} while (conf_cnt);
 	if (conf_write(NULL)) {
-		fprintf(stderr, _("\n*** Error during writing of the busybox configuration.\n\n"));
+		fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
 		return 1;
 	}
 	return 0;

Modified: trunk/busybox/scripts/kconfig/confdata.c
===================================================================
--- trunk/busybox/scripts/kconfig/confdata.c	2008-05-28 11:40:29 UTC (rev 22101)
+++ trunk/busybox/scripts/kconfig/confdata.c	2008-05-28 11:59:32 UTC (rev 22102)
@@ -437,7 +437,7 @@
 					       " */\n", str);
 		} else if (!(sym->flags & SYMBOL_CHOICE)) {
 			sym_calc_value(sym);
-/* bbox: we want to all syms
+/* bbox: we want to see all syms
 			if (!(sym->flags & SYMBOL_WRITE))
 				goto next;
 */

Modified: trunk/busybox/scripts/kconfig/gconf.c
===================================================================
--- trunk/busybox/scripts/kconfig/gconf.c	2008-05-28 11:40:29 UTC (rev 22101)
+++ trunk/busybox/scripts/kconfig/gconf.c	2008-05-28 11:59:32 UTC (rev 22102)
@@ -741,8 +741,7 @@
 {
 	GtkWidget *dialog;
 	const gchar *intro_text = _(
-	    "Welcome to gkc, the GTK+ graphical busybox configuration tool\n"
-	    "for Linux.\n"
+	    "Welcome to gkc, the GTK+ graphical configuration tool.\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"
 	    "be compiled as a module.  Clicking on the box will cycle through the three states.\n"

Modified: trunk/busybox/scripts/kconfig/lxdialog/BIG.FAT.WARNING
===================================================================
--- trunk/busybox/scripts/kconfig/lxdialog/BIG.FAT.WARNING	2008-05-28 11:40:29 UTC (rev 22101)
+++ trunk/busybox/scripts/kconfig/lxdialog/BIG.FAT.WARNING	2008-05-28 11:59:32 UTC (rev 22102)
@@ -1,4 +1,4 @@
 This is NOT the official version of dialog.  This version has been
-significantly modified from the original.  It is for use by the Linux
-busybox configuration script.  Please do not bother Savio Lam with
-questions about this program.
+significantly modified from the original.  It was used by the Linux
+kernel configuration script, and subsequently adapted for busybox.
+Please do not bother Savio Lam with questions about this program.

Modified: trunk/busybox/scripts/kconfig/mconf.c
===================================================================
--- trunk/busybox/scripts/kconfig/mconf.c	2008-05-28 11:40:29 UTC (rev 22101)
+++ trunk/busybox/scripts/kconfig/mconf.c	2008-05-28 11:59:32 UTC (rev 22102)
@@ -115,7 +115,7 @@
 "-----------------------------\n"
 "Menuconfig supports the use of alternate configuration files for\n"
 "those who, for various reasons, find it necessary to switch\n"
-"between different busybox configurations.\n"
+"between different configurations.\n"
 "\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"
@@ -148,7 +148,7 @@
 "\n"
 "Optional personality available\n"
 "------------------------------\n"
-"If you prefer to have all of the busybox options listed in a single\n"
+"If you prefer to have all of the options listed in a single\n"
 "menu, rather than the default multimenu hierarchy, run the menuconfig\n"
 "with MENUCONFIG_MODE environment variable set to single_menu. Example:\n"
 "\n"
@@ -193,11 +193,11 @@
 	"last retrieved.  Leave blank to abort."),
 load_config_help[] = N_(
 	"\n"
-	"For various reasons, one may wish to keep several different busybox\n"
+	"For various reasons, one may wish to keep several different\n"
 	"configurations available on a single machine.\n"
 	"\n"
-	"If you have saved a previous configuration in a file other than \n"
-	"busybox's default, entering the name of the file here will allow you\n"
+	"If you have saved a previous configuration in a file other than\n"
+	"default, entering the name of the file here will allow you\n"
 	"to modify that configuration.\n"
 	"\n"
 	"If you are uncertain, then you have probably never used alternate\n"
@@ -207,7 +207,7 @@
 	"as an alternate.  Leave blank to abort."),
 save_config_help[] = N_(
 	"\n"
-	"For various reasons, one may wish to keep different busybox\n"
+	"For various reasons, one may wish to keep different\n"
 	"configurations available on a single machine.\n"
 	"\n"
 	"Entering a file name here will allow you to later retrieve, modify\n"
@@ -1070,7 +1070,7 @@
 	do {
 		cprint_init();
 		cprint("--yesno");
-		cprint(_("Do you wish to save your new busybox configuration?"));
+		cprint(_("Do you wish to save your new configuration?"));
 		cprint("5");
 		cprint("60");
 		stat = exec_conf();
@@ -1079,18 +1079,18 @@
 	if (stat == 0) {
 		if (conf_write(NULL)) {
 			fprintf(stderr, _("\n\n"
-				"Error during writing of the busybox configuration.\n"
-				"Your busybox configuration changes were NOT saved."
+				"Error during writing of the configuration.\n"
+				"Your configuration changes were NOT saved."
 				"\n\n"));
 			return 1;
 		}
 		printf(_("\n\n"
-			"*** End of busybox configuration.\n"
-			"*** Execute 'make' to build busybox or try 'make help'."
+			"*** End of configuration.\n"
+			"*** Execute 'make' to build the project or try 'make help'."
 			"\n\n"));
 	} else {
 		fprintf(stderr, _("\n\n"
-			"Your busybox configuration changes were NOT saved."
+			"Your configuration changes were NOT saved."
 			"\n\n"));
 	}
 

Modified: trunk/busybox/scripts/kconfig/qconf.cc
===================================================================
--- trunk/busybox/scripts/kconfig/qconf.cc	2008-05-28 11:40:29 UTC (rev 22101)
+++ trunk/busybox/scripts/kconfig/qconf.cc	2008-05-28 11:59:32 UTC (rev 22102)
@@ -1299,7 +1299,7 @@
 
 void ConfigMainWindow::showIntro(void)
 {
-	static char str[] = "Welcome to the qconf graphical busybox configuration tool for Linux.\n\n"
+	static char str[] = "Welcome to the qconf graphical configuration tool.\n\n"
 		"For each option, a blank box indicates the feature is disabled, a check\n"
 		"indicates it is enabled, and a dot indicates that it is to be compiled\n"
 		"as a module.  Clicking on the box will cycle through the three states.\n\n"
@@ -1316,8 +1316,7 @@
 
 void ConfigMainWindow::showAbout(void)
 {
-	static char str[] = "qconf is Copyright (C) 2002 Roman Zippel <zippel at linux-m68k.org>.\n\n"
-		"Bug reports and feature request can also be entered at http://bugs.busybox.net/\n";
+	static char str[] = "qconf is Copyright (C) 2002 Roman Zippel <zippel at linux-m68k.org>.\n";
 
 	QMessageBox::information(this, "qconf", str);
 }




More information about the busybox-cvs mailing list