view po/Makefile.in.in.patch @ 565:85b9cec260bc

Fix a bug occuring when using certain actions on a collection item which is not in the selection. Triggering it will either result in an assertion failure or a segfault. To reproduce: - open a collection - right-click on a non-selected image - select Delete... menu entry (or Copy, Move, Rename, Properties...) It results in the best case: ** ERROR **: file filelist.c: line 905 (file_data_ref): assertion failed: (fd->magick == 0x12345678) or a pure segfault due to corrupted data. collection_table_popup_file_list() has to return a list of filedata * not a list of gchar *.

--- 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 @@
 	    || cp -p $(srcdir)/$$file $(distdir); \
 	done
 
-update-po: Makefile
+### Updating po and gmo files
+#
+# Update by merging all .po files with the .po template master file.
+#
+# 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
+	@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 \
+	    mv -f $(lang).new.po $(lang).po; \
+	  else \
+	    echo "msgmerge failed!"; \
+	    rm -f $(lang).new.po; \
+	  fi; \
+	)
+	$(MAKE) update-gmo
+
+update-gmo: Makefile $(CATALOGS)
+	@:
+
+update-po-orig: Makefile
 	$(MAKE) $(GETTEXT_PACKAGE).pot
 	tmpdir=`pwd`; \
 	cd $(srcdir); \