From owner-svn-doc-all@freebsd.org  Mon Aug 14 21:08:30 2017
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 12F18DE4AFF;
 Mon, 14 Aug 2017 21:08:30 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D62746EF5B;
 Mon, 14 Aug 2017 21:08:29 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7EL8TdH062939;
 Mon, 14 Aug 2017 21:08:29 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7EL8SlN062937;
 Mon, 14 Aug 2017 21:08:28 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201708142108.v7EL8SlN062937@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 14 Aug 2017 21:08:28 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50677 - head/share/mk
X-SVN-Group: doc-head
X-SVN-Commit-Author: wblock
X-SVN-Commit-Paths: head/share/mk
X-SVN-Commit-Revision: 50677
X-SVN-Commit-Repository: doc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Aug 2017 21:08:30 -0000

Author: wblock
Date: Mon Aug 14 21:08:28 2017
New Revision: 50677
URL: https://svnweb.freebsd.org/changeset/doc/50677

Log:
  Trim obsolete translations from PO files.  These are translations for
  text which does not exist in the original English document any more.

Modified:
  head/share/mk/doc.commands.mk
  head/share/mk/doc.docbook.mk

Modified: head/share/mk/doc.commands.mk
==============================================================================
--- head/share/mk/doc.commands.mk	Mon Aug 14 20:40:43 2017	(r50676)
+++ head/share/mk/doc.commands.mk	Mon Aug 14 21:08:28 2017	(r50677)
@@ -82,6 +82,7 @@ ITSTOOL?=	${PREFIX}/bin/itstool
 
 JING?=		${PREFIX}/bin/jing
 
+MSGATTRIB?=	${PREFIX}/bin/msgattrib
 MSGFMT?=	${PREFIX}/bin/msgfmt
 MSGMERGE?=	${PREFIX}/bin/msgmerge
 

Modified: head/share/mk/doc.docbook.mk
==============================================================================
--- head/share/mk/doc.docbook.mk	Mon Aug 14 20:40:43 2017	(r50676)
+++ head/share/mk/doc.docbook.mk	Mon Aug 14 21:08:28 2017	(r50677)
@@ -366,7 +366,8 @@ ${PO_LANG}.po:	${DOC}.translate.xml
 	@${ITSTOOL} -o ${PO_LANG}.po.tmp ${DOC}.translate.xml
 	@( if [ -f "${PO_LANG}.po" ]; then \
 		echo "${PO_LANG}.po exists, merging" ; \
-		${MSGMERGE} -o ${PO_LANG}.po.new ${PO_LANG}.po ${PO_LANG}.po.tmp ;\
+		${MSGMERGE} -o ${PO_LANG}.po.new ${PO_LANG}.po ${PO_LANG}.po.tmp ; \
+		${MSGATTRIB} --no-obsolete -o ${PO_LANG}.po.new ${PO_LANG}.po ; \
 		${MV} ${PO_LANG}.po.new ${PO_LANG}.po ; \
 		${RM} ${PO_LANG}.po.tmp ; \
 	  else \