Revision: 1674
http://geeqie.svn.sourceforge.net/geeqie/?rev=1674&view=rev
Author: zas_
Date: 2009-04-28 21:37:27 +0000 (Tue, 28 Apr 2009)
Log Message:
-----------
Fix up po/Makefile to rebuild geeqie.pot when POTFILES.in was modified. Without
this change, new translatable strings in recently added files were not
available for translation in various .po files after a make update-po.
Makefile.in.in.patch was modified to include this fix plus some minor cleanups.
Modified Paths:
--------------
trunk/po/Makefile.in.in.patch
Modified: trunk/po/Makefile.in.in.patch
===================================================================
--- trunk/po/Makefile.in.in.patch 2009-04-28 20:09:41 UTC (rev 1673)
+++ trunk/po/Makefile.in.in.patch 2009-04-28 21:37:27 UTC (rev 1674)
@@ -1,10 +1,20 @@
---- Makefile.in.in 2008-04-19 14:36:53.000000000 +0200
-+++ Makefile.in.in.new 2008-04-19 14:39:19.000000000 +0200
-@@ -216,7 +216,30 @@
+--- Makefile.in.in 2009-04-28 23:27:08.000000000 +0200
++++ Makefile.in.in.new 2009-04-28 23:25:22.000000000 +0200
+@@ -92,7 +92,7 @@
+ all-yes: $(CATALOGS)
+ all-no:
+
+-$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
++$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
+ $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE)
--directory=$(top_srcdir) \
+ --add-comments --keyword=_ --keyword=N_ \
+ --flag=g_strdup_printf:1:c-format \
+@@ -216,8 +216,31 @@
|| cp -p $(srcdir)/$$file $(distdir); \
done
-update-po: Makefile
+- $(MAKE) $(GETTEXT_PACKAGE).pot
+### Updating po and gmo files
+#
+# Update by merging all .po files with the .po template master file.
@@ -12,11 +22,11 @@
+# It is possible to update only a single .po file by setting the PO variable
to
+# either <lang> or <lang>.po when calling make. Example: make update-po PO=is
+
-+update-po: Makefile $(GETTEXT_PACKAGE).pot
++update-po: Makefile $(srcdir)/$(GETTEXT_PACKAGE).pot
+ @cd $(srcdir); \
+ $(foreach lang,$(basename $(if $(strip $(PO)),$(PO),$(CATALOGS))), \
+ echo -n "$(lang): "; \
-+ if $(MSGMERGE) $(lang).po $(GETTEXT_PACKAGE).pot -o $(lang).new.po;
then \
++ if $(MSGMERGE) $(lang).po $(srcdir)/$(GETTEXT_PACKAGE).pot -o
$(lang).new.po; then \
+ mv -f $(lang).new.po $(lang).po; \
+ else \
+ echo "msgmerge failed!"; \
@@ -29,6 +39,16 @@
+ @:
+
+update-po-orig: Makefile
- $(MAKE) $(GETTEXT_PACKAGE).pot
++ $(MAKE) $(srcdir)/$(GETTEXT_PACKAGE).pot
tmpdir=`pwd`; \
cd $(srcdir); \
+ catalogs='$(CATALOGS)'; \
+@@ -225,7 +248,7 @@
+ cat=`basename $$cat`; \
+ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ echo "$$lang:"; \
+- if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).pot -o
$$tmpdir/$$lang.new.po; then \
++ if $(MSGMERGE) $$lang.po $(srcdir)/$(GETTEXT_PACKAGE).pot -o
$$tmpdir/$$lang.new.po; then \
+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+ rm -f $$tmpdir/$$lang.new.po; \
+ else \
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Register Now & Save for Velocity, the Web Performance & Operations
Conference from O'Reilly Media. Velocity features a full day of
expert-led, hands-on workshops and two days of sessions from industry
leaders in dedicated Performance & Operations tracks. Use code vel09scf
and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
