annotate 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 *.
author zas_
date Sat, 03 May 2008 16:58:17 +0000
parents 53cfc5af7fd7
children 240cf36c9a44
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
420
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
1 --- Makefile.in.in 2008-04-19 14:36:53.000000000 +0200
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
2 +++ Makefile.in.in.new 2008-04-19 14:39:19.000000000 +0200
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
3 @@ -216,7 +216,30 @@
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
4 || cp -p $(srcdir)/$$file $(distdir); \
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
5 done
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
6
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
7 -update-po: Makefile
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
8 +### Updating po and gmo files
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
9 +#
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
10 +# Update by merging all .po files with the .po template master file.
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
11 +#
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
12 +# It is possible to update only a single .po file by setting the PO variable to
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
13 +# either <lang> or <lang>.po when calling make. Example: make update-po PO=is
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
14 +
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
15 +update-po: Makefile $(GETTEXT_PACKAGE).pot
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
16 + @cd $(srcdir); \
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
17 + $(foreach lang,$(basename $(if $(strip $(PO)),$(PO),$(CATALOGS))), \
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
18 + echo -n "$(lang): "; \
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
19 + if $(MSGMERGE) $(lang).po $(GETTEXT_PACKAGE).pot -o $(lang).new.po; then \
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
20 + mv -f $(lang).new.po $(lang).po; \
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
21 + else \
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
22 + echo "msgmerge failed!"; \
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
23 + rm -f $(lang).new.po; \
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
24 + fi; \
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
25 + )
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
26 + $(MAKE) update-gmo
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
27 +
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
28 +update-gmo: Makefile $(CATALOGS)
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
29 + @:
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
30 +
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
31 +update-po-orig: Makefile
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
32 $(MAKE) $(GETTEXT_PACKAGE).pot
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
33 tmpdir=`pwd`; \
53cfc5af7fd7 Add the possibility to update only one translation file using,
zas_
parents:
diff changeset
34 cd $(srcdir); \