* src/lyxtext.h: deleteEmptyParagraphMechanism(LCursor &, LCursor &, bool &),

[lyx.git] / po / Makefile.in.in

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 5f4508056d430f280ecf7f4e69755fef7fcdeaa3..a03204e28fa578cfb8c093d16b3edc1d93313d46 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -22,6 +22,7 @@ VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
 localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/po
@@ -373,31 +374,39 @@ ${srcdir}/POTFILES.in: $(POTFILE_IN_DEPS)
             sort | uniq ) > $@-t \
        && mv $@-t $@
 
-l10n_pots: qt_l10n.pot layouts_l10n.pot languages_l10n.pot ui_l10n.pot
+l10n_pots: qt4_l10n.pot layouts_l10n.pot languages_l10n.pot ui_l10n.pot
        cat $^ | \
        msguniq -o $(DOMAIN).po && rm -f  $^
 
-qt_l10n.pot: $(top_srcdir)/src/frontends/qt3/ui/*.ui
+
+qt4_l10n.pot: $(top_srcdir)/src/frontends/qt4/ui/*.ui
        LC_ALL=C ; export LC_ALL ; \
        $(AWK) -v top_srcdir="$(top_srcdir)" ' \
                function fixupfilename() \
                {\
                        return substr(FILENAME, length(top_srcdir "/") + 1);\
                }\
-               /<string>/ { \
-                       line=$$0; \
-                       sub(/.*<string>/, "", line); \
-                       sub(/<\/string>.*/, "", line); \
-                       gsub(/&amp;/, "\\&", line); \
-                       gsub(/&lt;/, "<", line); \
-                       gsub(/&gt;/, ">", line); \
-                       gsub(/"/, "\\\"", line); \
-                       if (length(line) > 0) {\
-                               printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n",\
+               BEGIN { \
+                       previousline=""; \
+               } \
+               { \
+                       if (!(previousline ~ /^ *< *property  *name *= *"shortcut" *> *$$/) \
+                           && $$0 ~ /<string>/) { \
+                               line=$$0; \
+                               sub(/.*<string>/, "", line); \
+                               sub(/<\/string>.*/, "", line); \
+                               gsub(/&amp;/, "\\&", line); \
+                               gsub(/&lt;/, "<", line); \
+                               gsub(/&gt;/, ">", line); \
+                               gsub(/"/, "\\\"", line); \
+                               if (length(line) > 0) { \
+                                       printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
                                        fixupfilename(), FNR, line); \
+                               } \
                        } \
+                       previousline=$$0; \
                }' \
-       ${top_srcdir}/src/frontends/qt3/ui/*.ui > $@
+       ${top_srcdir}/src/frontends/qt4/ui/*.ui > $@
 
 layouts_l10n.pot: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc
        LC_ALL=C ; export LC_ALL ; \
@@ -457,7 +466,7 @@ languages_l10n.pot: $(top_srcdir)/lib/languages
                }' \
        ${top_srcdir}/lib/languages > $@
 
-ui_l10n.pot: $(top_srcdir)/lib/ui/*.ui
+ui_l10n.pot: $(top_srcdir)/lib/ui/*.ui $(top_srcdir)/lib/ui/*.inc
        LC_ALL=C ; export LC_ALL ; \
        $(AWK) -v top_srcdir="$(top_srcdir)" ' \
                function fixupfilename() \
@@ -471,9 +480,9 @@ ui_l10n.pot: $(top_srcdir)/lib/ui/*.ui
                        printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
                                fixupfilename(), FNR, line); \
                } \
-               /^[^#]*Toolbar/ { \
+               /^[^#]*Toolbar[^s]/ { \
                        line=$$0; \
-                       sub(/[^"]*"/, "", line); \
+                       sub(/[^"]*"[^"]*"[^"]"*/, "", line); \
                        sub(/".*/, "", line); \
                        printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
                                fixupfilename(), FNR, line); \
@@ -485,7 +494,7 @@ ui_l10n.pot: $(top_srcdir)/lib/ui/*.ui
                        printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
                                fixupfilename(), FNR, line); \
                }' \
-       ${top_srcdir}/lib/ui/*.ui > $@
+       ${top_srcdir}/lib/ui/*.ui ${top_srcdir}/lib/ui/*.inc > $@
 
 i18n.php: $(POFILES)
        (cd $(srcdir) ; ./postats.sh $(POFILES)) >$@