2008-11-28 [paul] 3.6.1cvs49

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

diff --git a/ChangeLog b/ChangeLog
index 60ea3dae98f2654252aa3d06f0311c8b5cbe1a38..f4d66f716d6b29ef7b03ed1d03cbc241e5c970f8 100644 (file)
--- 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
index 42bbd5e8505b294e981dba1591e005382f5d4efb..e220479ffb38123ce226c17a796e52f6ba02ee81 100644 (file)
--- 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
index 075b94acabf4589046d14695dc6dc83efd8d91c7..e4b09c0d7d65c1e444d4a4ade1f4fd8050344313 100644 (file)
--- 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
index 2ed49e62d1af113122d2bf5a9625f40f71c29b75..4d89bb0673604b4213bb739ad8c62395c30ff209 100644 (file)
--- 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