svn commit: r50677 - head/share/mk

[Warren Block]

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 \