From bbbf1f331a3f9ad7829025b7649871bc59506feb Mon Sep 17 00:00:00 2001
From: EGRY Gabor <gaboregry1@t-online.hu>
Date: Fri, 11 Jan 2008 23:46:11 +0100
Subject: [PATCH] --- yaml --- r: 77975 b: refs/heads/master c:
 46d2631978c05e55b28454ac864aba0287f50322 h: refs/heads/master i:   77973:
 b64c623c86143309b8b61652da89ee62979ae3d2   77971:
 b5f465e4b295233704d5a69c848623209b085059   77967:
 ba54c304723fad300e7174fb64d7bf7d5891ef1d v: v3

---
 [refs]                            | 2 +-
 trunk/scripts/kconfig/Makefile    | 7 +++++--
 trunk/scripts/kconfig/POTFILES.in | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b0dca2517be7..11f443ec81ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb7ef3905adce28db31933ae77e5397c0b89227a
+refs/heads/master: 46d2631978c05e55b28454ac864aba0287f50322
diff --git a/trunk/scripts/kconfig/Makefile b/trunk/scripts/kconfig/Makefile
index d28bf8550171..32e8c5a227c3 100644
--- a/trunk/scripts/kconfig/Makefile
+++ b/trunk/scripts/kconfig/Makefile
@@ -27,7 +27,7 @@ silentoldconfig: $(obj)/conf
 # Create new linux.pot file
 # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
 # The symlink is used to repair a deficiency in arch/um
-update-po-config: $(obj)/kxgettext
+update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
 	$(Q)echo "  GEN config"
 	$(Q)xgettext --default-domain=linux              \
 	    --add-comments --keyword=_ --keyword=N_      \
@@ -139,7 +139,7 @@ gconf-objs	:= gconf.o kconfig_load.o zconf.tab.o
 endif
 
 clean-files	:= lkc_defs.h qconf.moc .tmp_qtcheck \
-		   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c
+		   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
 clean-files     += mconf qconf gconf
 clean-files     += config.pot linux.pot
 
@@ -254,6 +254,9 @@ $(obj)/%.moc: $(src)/%.h
 $(obj)/lkc_defs.h: $(src)/lkc_proto.h
 	sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
 
+# Extract gconf menu items for I18N support
+$(obj)/gconf.glade.h: $(obj)/gconf.glade
+	intltool-extract --type=gettext/glade $(obj)/gconf.glade
 
 ###
 # The following requires flex/bison/gperf
diff --git a/trunk/scripts/kconfig/POTFILES.in b/trunk/scripts/kconfig/POTFILES.in
index cc94e46a79e8..19d0e63fb7ba 100644
--- a/trunk/scripts/kconfig/POTFILES.in
+++ b/trunk/scripts/kconfig/POTFILES.in
@@ -2,4 +2,5 @@ scripts/kconfig/mconf.c
 scripts/kconfig/conf.c
 scripts/kconfig/confdata.c
 scripts/kconfig/gconf.c
+scripts/kconfig/gconf.glade.h
 scripts/kconfig/qconf.cc