From ccb4b08e5279b1d659e475f57fba44fd5ad0cd4f Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Thu, 19 Jan 2017 20:21:08 +0100
Subject: i18n: conflict warning

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 7d5e6be0..c7be6555 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,8 @@ locale-update: locale/messages.pot
 	pybabel update -i locale/messages.pot -d locale -l it --previous
 	pybabel update -i locale/messages.pot -d locale -l es --previous
 
+	if grep -nA1 '#-#-#-#-#' locale/*/LC_MESSAGES/messages.po; then echo -e "\nERROR: Conflicts encountered in PO files.\n"; exit 1; fi
+
 locale-compile:
 	pybabel compile -d locale -l en --use-fuzzy
 	pybabel compile -d locale -l de --use-fuzzy
-- 
cgit v1.2.3