From a6fcd89a041dce9b43117b90901ad94af1723ba7 Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Wed, 2 May 2018 00:09:15 +0200
Subject: [PATCH] Let's not translate the changelog (and no fuzzy for
 whatsnew/).

---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 885be439..9786e67f 100644
--- a/Makefile
+++ b/Makefile
@@ -69,6 +69,7 @@ merge: $(VENV)/bin/sphinx-build
 ifneq "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all HEAD)" "$(BRANCH)"
 	$(error "You're merging from a different branch")
 endif
+	(cd $(CPYTHON_CLONE)/Doc; rm -f build/NEWS)
 	(cd $(CPYTHON_CLONE); $(VENV)/bin/sphinx-build -Q -b gettext -D gettext_compact=0 Doc pot/)
 	find $(CPYTHON_CLONE)/pot/ -name '*.pot' |\
 	    while read -r POT;\
@@ -77,7 +78,10 @@ endif
 	        mkdir -p "$$(dirname "$$PO")";\
 	        if [ -f "$$PO" ];\
 	        then\
-	            msgmerge --backup=off --force-po -U "$$PO" "$$POT";\
+	            case "$$POT" in\
+	            *whatsnew*) msgmerge --backup=off --force-po --no-fuzzy-matching -U "$$PO" "$$POT" ;;\
+	            *)          msgmerge --backup=off --force-po -U "$$PO" "$$POT" ;;\
+	            esac\
 	        else\
 	            msgcat -o "$$PO" "$$POT";\
 	        fi\