This patch removes the ext_l10n.h file and makes language and ui
strings be generated the same way as xforms, qt and layout strings.
Index: po/Makefile.in.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/po/Makefile.in.in,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile.in.in
--- po/Makefile.in.in 9 Dec 2002 00:45:06 -0000 1.21
+++ po/Makefile.in.in 14 Dec 2002 12:41:27 -0000
@@ -86,7 +86,7 @@ all-no:
# otherwise packages like GCC can not be built if only parts of the source
# have been downloaded.
-$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in $(top_srcdir)/src/ext_l10n.h l10n_pots
+$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in l10n_pots
$(XGETTEXT) --join-existing --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
--escape --add-comments --keyword=_ --keyword=N_ \
--files-from=$(srcdir)/POTFILES.in \
@@ -205,8 +205,8 @@ ${srcdir}/POTFILES.in: $(POTFILE_IN_DEPS
&& mv $@-t $@
-l10n_pots: xforms_l10n.pot qt_l10n.pot layouts_l10n.pot
- cat xforms_l10n.pot qt_l10n.pot layouts_l10n.pot | \
+l10n_pots: xforms_l10n.pot qt_l10n.pot layouts_l10n.pot languages_l10n.pot default_ui_l10n.pot
+ cat xforms_l10n.pot qt_l10n.pot layouts_l10n.pot languages_l10n.pot default_ui_l10n.pot | \
msguniq -o $(PACKAGE).po
xforms_l10n.pot: $(top_srcdir)/src/frontends/xforms/forms/*.fd
@@ -257,12 +257,36 @@ layouts_l10n.pot: $(top_srcdir)/lib/layo
} \
' `find $(top_srcdir)/lib/layouts -regex ".*\.\(layout\|inc\)"` > $@
-$(top_srcdir)/src/ext_l10n.h: $(top_srcdir)/lib/ui/default.ui $(top_srcdir)/lib/languages
- sed < $(top_srcdir)/lib/ui/default.ui -n \
- -e 's/.*[sS]ub[mM]enu[^"]*\("[^"]*"\).*/_(\1);/p' \
- -e 's/.*[iI]tem[^"]*\("[^"]*"\).*/_(\1);/p' \
- > $@
- sed < $(top_srcdir)/lib/languages -e '/^#/d' -e 's/[^"]*\("[A-Za-z0-9][^"]*"\).*/_(\1);/' >> $@
+languages_l10n.pot: $(top_srcdir)/lib/languages
+ awk ' \
+ /^#/ { \
+ next; \
+ } \
+ { \
+ lang=$$3; \
+ gsub(/\"/, "", lang); \
+ printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
+ FILENAME, FNR, lang); \
+ } \
+ ' $(top_srcdir)/lib/languages > $@
+
+default_ui_l10n.pot: $(top_srcdir)/lib/ui/default.ui
+ awk ' \
+ /SubMenu/ { \
+ line=$$0; \
+ sub(/[^"]*"/, "", line); \
+ sub(/".*/, "", line); \
+ printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
+ FILENAME, FNR, line); \
+ } \
+ /Item/ { \
+ line=$$0; \
+ sub(/[^"]*"/, "", line); \
+ sub(/".*/, "", line); \
+ printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
+ FILENAME, FNR, line); \
+ } \
+ ' $(top_srcdir)/lib/ui/default.ui > $@
# Tell versions [3.59,3.63) of GNU make not to export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--
Lgb
