talons

commit 132a3c38dbb27e73141cfa572cc94426bfd6f00f
parent 7b7c75d002412d0200c788116b7bbae94e67efd6
Author: Paul Mangan <paul@claws-mail.org>
Date:   Fri, 28 Nov 2008 08:54:20 +0000

2008-11-28 [paul]	3.6.1cvs49

	* po/Makefile.in.in
		automatically remove obsolete strings

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
po/Makefile.in.in
 | 
3
+++

4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-28 [paul]	3.6.1cvs49
+
+	* po/Makefile.in.in
+		automatically remove obsolete strings
+
 2008-11-28 [colin]	3.6.1cvs48
 
 	* src/plugins/pgpcore/sgpgme.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3630,3 +3630,4 @@
 ( cvs diff -u -r 1.9.2.36 -r 1.9.2.37 src/common/ssl.c;  ) > 3.6.1cvs46.patchset
 ( cvs diff -u -r 1.60.2.48 -r 1.60.2.49 src/filtering.c;  cvs diff -u -r 1.75.2.62 -r 1.75.2.63 src/matcher.c;  ) > 3.6.1cvs47.patchset
 ( cvs diff -u -r 1.1.2.57 -r 1.1.2.58 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs48.patchset
+( cvs diff -u -r 1.6.2.9 -r 1.6.2.10 po/Makefile.in.in;  ) > 3.6.1cvs49.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=48
+EXTRA_VERSION=49
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
@@ -47,6 +47,7 @@ XGETTEXT_yes = @XGETTEXT_015@
 XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGATTRIB = msgattrib --no-obsolete
 MSGINIT = msginit
 MSGCONV = msgconv
 MSGFILTER = msgfilter
@@ -159,6 +160,8 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
 	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
 	  cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+	  echo "$(MSGATTRIB) -o $${lang}.po $${lang}.po"; \
+	  $(MSGATTRIB) -o $${lang}.po $${lang}.po; \
 	else \
 	  $(MAKE) $${lang}.po-create; \
 	fi