X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=po%2FMakefile.in.in;h=4b056c4904c6c4c90cca614a4c6a68130b2dc6ea;hb=ede3d57013ab9046561a6b12861b5ba3e695b858;hp=9a025d856a5875b44c7c034ec062a252e5ae33de;hpb=f138892b9c0aca2a96479aea6df7dd9a467351a0;p=lyx.git

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 9a025d856a..4b056c4904 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -48,7 +48,8 @@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 POFILES = @POFILES@
 GMOFILES = @GMOFILES@
 DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
-$(POFILES) $(GMOFILES)
+$(POFILES) $(GMOFILES) xforms_l10n.pot qt_l10n.pot layouts_l10n.pot \
+languages_l10n.pot default_ui_l10n.pot
 
 POTFILE_IN_DEPS = $(shell find $(top_srcdir)/src -name Makefile.am)
 
@@ -86,13 +87,13 @@ 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 \
+	  --keyword=qt_ --files-from=$(srcdir)/POTFILES.in \
 	&& test ! -f $(PACKAGE).po \
 	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
-		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
+		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot || true)
 
 install: install-exec install-data
 install-exec:
@@ -201,20 +202,22 @@ ${srcdir}/POTFILES.in: $(POTFILE_IN_DEPS)
 	     grep -l "_(\".*\")" `find src -name \*.[hHC] -print` |\
 	     sed -e '/xforms.forms/d' | \
 	     sort -f -n | uniq ) > $@-t \
-	&& echo "src/ext_l10n.h" >> $@-t \
 	&& 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: $(srcdir)/xforms_l10n.pot $(srcdir)/qt_l10n.pot $(srcdir)/layouts_l10n.pot $(srcdir)/languages_l10n.pot $(srcdir)/default_ui_l10n.pot
+	cat $(srcdir)/xforms_l10n.pot $(srcdir)/qt_l10n.pot $(srcdir)/layouts_l10n.pot $(srcdir)/languages_l10n.pot $(srcdir)/default_ui_l10n.pot | \
 	msguniq -o $(PACKAGE).po
 
-xforms_l10n.pot: $(top_srcdir)/src/frontends/xforms/forms/*.fd
+$(srcdir)/xforms_l10n.pot: $(top_srcdir)/src/frontends/xforms/forms/*.fd
 	awk ' \
 	     BEGIN { \
+		     print "#, fuzzy"; \
 		     print "msgid \"\""; \
 		     print "msgstr \"\""; \
 		     print "\"Content-Type: text/plain; charset=ISO-8859-1\\n\""; \
+		     print "\"Content-Transfer-Encoding: 8bit\\n\""; \
+		     print "\n"; \
 	     } \
 	     /label: / { \
 		     if (NF > 1) { \
@@ -225,23 +228,22 @@ xforms_l10n.pot: $(top_srcdir)/src/frontends/xforms/forms/*.fd
 	     }' \
 	`find $(top_srcdir)/src/frontends/xforms/forms -name \*.fd` > $@
 
-qt_l10n.pot: $(top_srcdir)/src/frontends/qt2/ui/*.ui
+$(srcdir)/qt_l10n.pot: $(top_srcdir)/src/frontends/qt2/ui/*.ui
 	awk ' \
 	     /<string>/ { \
-	             if (NF > 1) { \
-		             line=$$0; \
-		             sub(/.*<string>/, "", line); \
-		             sub(/<\/string>.*/, "", line); \
-		             gsub(/&amp;/, "\\&", line); \
-		             gsub(/&lt;/, "<", line); \
-		             gsub(/&gt;/, ">", line); \
-	                     printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n",\
-			     FILENAME, FNR, line); \
-		     } \
+	             line=$$0; \
+	             sub(/.*<string>/, "", line); \
+	             sub(/<\/string>.*/, "", line); \
+	             gsub(/&amp;/, "\\&", line); \
+	             gsub(/&lt;/, "<", line); \
+	             gsub(/&gt;/, ">", line); \
+		     if (length(line) > 0) \
+                             printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n",\
+		     FILENAME, FNR, line); \
 	     }' \
 	`find $(top_srcdir)/src/frontends/qt2/ui -name \*.ui` > $@
 
-layouts_l10n.pot: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc
+$(srcdir)/layouts_l10n.pot: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc
 	awk ' \
 	    /^Style / { \
 		line=$$0; \
@@ -257,12 +259,36 @@ layouts_l10n.pot: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*
 	    } \
 	    ' `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);/' >> $@
+$(srcdir)/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 > $@
+
+$(srcdir)/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.