fix a qt extraction bug

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5831 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/po/.cvsignore b/po/.cvsignore
index d2a9c2db00a4b8ec3c11412b1e3aa72d307234c0..c2db6c85c5f813e53b9414a323e070418e535640 100644 (file)
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -10,3 +10,5 @@ lyx.pot
 layouts_l10n.pot
 qt_l10n.pot
 xforms_l10n.pot
+default_ui_l10n.pot
+languages_l10n.pot

diff --git a/po/ChangeLog b/po/ChangeLog
index 515d65c1a4c5e5b5295544e48e1f90b3d1f8e4f7..d7a7cb20ed52ee4273443fa7013fc327b7e3e3f3 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-16  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * Makefile.in.in (qt_l10n.pot): Fix a bug that resulted in too few
+       strings being extracted. 
+
 2002-12-14  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * Makefile.in.in (languages_l10n.pot): new target

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index d4115264beceb77ef0cc0315b98a94875971d2a6..c291589b65ff23935e69ba58cd51aa4f3e867571 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -206,15 +206,18 @@ ${srcdir}/POTFILES.in: $(POTFILE_IN_DEPS)
 
 
 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
+       cat xforms_l10n.pot qt_l10n.pot layouts_l10n.pot languages_l10n.pot default_ui_l10n.pot > lyxtmp.pot && \
+       msguniq -o $(PACKAGE).po lyxtmp.pot
 
 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) { \
@@ -228,16 +231,15 @@ xforms_l10n.pot: $(top_srcdir)/src/frontends/xforms/forms/*.fd
 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` > $@