Dear Jean-Marc,

there is still a problem with the pot file generation that causes a really big patch for "de.po" though there are just a few changes.

One reason is that the "find" command does not ensure that files are listed alphabetically. Please have a look at the attached patch that seems to solve the problem in a very simple way.

The second problem is that many differences look like this one:

-#: ../../1.3.x/src/frontends/xforms/forms/form_bibitem.fd:44
+#: ../src/frontends/xforms/forms/form_bibitem.fd:44
 msgid "Key:|#K"
 msgstr "Schlüssel:|#S"

Where does this relative path come from? I also installed the LyX sources in a separate directory but I have never seen paths like this before.

Could you please apply my patch (for 1.3.X and 1.4.0) and update the po files? Afterwards, I will send you my (hopefully small) de.po patch and inform the translators about the recent changes.

Kind regards, Michael
Index: Makefile.in.in
===================================================================
RCS file: /cvs/lyx/lyx-devel/po/Makefile.in.in,v
retrieving revision 1.28.2.3
diff -u -r1.28.2.3 Makefile.in.in
--- Makefile.in.in      2003/11/19 16:27:57     1.28.2.3
+++ Makefile.in.in      2003/11/23 22:28:44
@@ -63,7 +63,7 @@
 .c.o:
        $(COMPILE) $<
 
-.po.pox:
+.po.pox: $(srcdir)/$(PACKAGE).pot
        $(MAKE) $(srcdir)/$(PACKAGE).pot
        $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
 
@@ -231,7 +231,7 @@
                     }\
                     skip=0; \
             }' \
-       `find $(top_srcdir)/src/frontends/xforms/forms -name \*.fd` > $@
+       `ls -1 $(top_srcdir)/src/frontends/xforms/forms/*.fd` > $@
 
 $(srcdir)/qt_l10n.pot: $(top_srcdir)/src/frontends/qt2/ui/*.ui
        awk ' \
@@ -246,7 +246,7 @@
                              printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n",\
                     FILENAME, FNR, line); \
             }' \
-       `find $(top_srcdir)/src/frontends/qt2/ui -name \*.ui` > $@
+       `ls -1 $(top_srcdir)/src/frontends/qt2/ui/*.ui` > $@
 
 $(srcdir)/layouts_l10n.pot: $(top_srcdir)/lib/layouts/*.layout 
$(top_srcdir)/lib/layouts/*.inc
        awk ' \
@@ -262,7 +262,7 @@
                printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
                       FILENAME, FNR, line); \
            } \
-           ' `find $(top_srcdir)/lib/layouts -regex ".*\.\(layout\|inc\)"` > $@
+           ' `ls -1 $(top_srcdir)/lib/layouts/*.layout 
$(top_srcdir)/lib/layouts/*.inc` > $@
 
 $(srcdir)/languages_l10n.pot: $(top_srcdir)/lib/languages
        awk ' \

Reply via email to