1--- 2 confdata.c | 4 ++-- 3 gconf.glade | 2 +- 4 mconf.c | 4 ++-- 5 zconf.tab.c_shipped | 2 +- 6 zconf.y | 2 +- 7 5 files changed, 7 insertions(+), 7 deletions(-) 8 9Index: kconfig/gconf.glade 10=================================================================== 11--- kconfig.orig/gconf.glade 12+++ kconfig/gconf.glade 13@@ -4,7 +4,7 @@ 14 15 <widget class="GtkWindow" id="window1"> 16 <property name="visible">True</property> 17- <property name="title" translatable="yes">Gtk Kernel Configurator</property> 18+ <property name="title" translatable="yes">Gtk Buildroot Configurator</property> 19 <property name="type">GTK_WINDOW_TOPLEVEL</property> 20 <property name="window_position">GTK_WIN_POS_NONE</property> 21 <property name="modal">False</property> 22Index: kconfig/mconf.c 23=================================================================== 24--- kconfig.orig/mconf.c 25+++ kconfig/mconf.c 26@@ -176,9 +176,9 @@ menu_instructions[] = N_( 27 "Arrow keys navigate the menu. " 28 "<Enter> selects submenus ---> (or empty submenus ----). " 29 "Highlighted letters are hotkeys. " 30- "Pressing <Y> includes, <N> excludes, <M> modularizes features. " 31+ "Pressing <Y> selects a feature, while <N> excludes a feature. " 32 "Press <Esc><Esc> to exit, <?> for Help, </> for Search. " 33- "Legend: [*] built-in [ ] excluded <M> module < > module capable"), 34+ "Legend: [*] feature is selected [ ] feature is excluded"), 35 radiolist_instructions[] = N_( 36 "Use the arrow keys to navigate this window or " 37 "press the hotkey of the item you wish to select " 38@@ -962,7 +962,7 @@ static int handle_exit(void) 39 if (conf_get_changed()) 40 res = dialog_yesno(NULL, 41 _("Do you wish to save your new configuration?\n" 42- "(Press <ESC><ESC> to continue kernel configuration.)"), 43+ "(Press <ESC><ESC> to continue Buildroot configuration.)"), 44 6, 60); 45 else 46 res = -1; 47Index: kconfig/zconf.tab.c_shipped 48=================================================================== 49--- kconfig.orig/zconf.tab.c_shipped 50+++ kconfig/zconf.tab.c_shipped 51@@ -1515,7 +1515,7 @@ yyreduce: 52 * later regardless of whether it comes from the 'prompt' in 53 * mainmenu_stmt or here 54 */ 55- menu_add_prompt(P_MENU, xstrdup("Linux Kernel Configuration"), NULL); 56+ menu_add_prompt(P_MENU, xstrdup("Buildroot Configuration"), NULL); 57 } 58 59 break; 60Index: kconfig/zconf.y 61=================================================================== 62--- kconfig.orig/zconf.y 63+++ kconfig/zconf.y 64@@ -127,7 +127,7 @@ no_mainmenu_stmt: /* empty */ 65 * later regardless of whether it comes from the 'prompt' in 66 * mainmenu_stmt or here 67 */ 68- menu_add_prompt(P_MENU, xstrdup("Linux Kernel Configuration"), NULL); 69+ menu_add_prompt(P_MENU, xstrdup("Buildroot Configuration"), NULL); 70 }; 71 72 73Index: kconfig/confdata.c 74=================================================================== 75--- kconfig.orig/confdata.c 76+++ kconfig/confdata.c 77@@ -30,7 +30,7 @@ static void conf_message(const char *fmt 78 static const char *conf_filename; 79 static int conf_lineno, conf_warnings; 80 81-const char conf_defname[] = "arch/$ARCH/defconfig"; 82+const char conf_defname[] = ".defconfig"; 83 84 static void conf_warning(const char *fmt, ...) 85 { 86@@ -69,7 +69,7 @@ static void conf_message(const char *fmt 87 88 const char *conf_get_configname(void) 89 { 90- char *name = getenv("KCONFIG_CONFIG"); 91+ char *name = getenv("BR2_CONFIG"); 92 93 return name ? name : ".config"; 94 } 95Index: kconfig/qconf.cc 96=================================================================== 97--- kconfig.orig/qconf.cc 98+++ kconfig/qconf.cc 99@@ -55,7 +55,7 @@ static inline QString qgettext(const QSt 100 } 101 102 ConfigSettings::ConfigSettings() 103- : QSettings("kernel.org", "qconf") 104+ : QSettings("buildroot.org", "qconf") 105 { 106 } 107 108