[GNUnet-SVN] [taler-www] 04/04: i18n: conflict warning

[gnunet]

This is an automated email from the git hooks/post-receive script.

tg pushed a commit to branch master
in repository www.

commit ccb4b08e5279b1d659e475f57fba44fd5ad0cd4f
Author: tg(x) <address@hidden>
AuthorDate: Thu Jan 19 20:21:08 2017 +0100

    i18n: conflict warning
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 7d5e6be..c7be655 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

-- 
To stop receiving notification emails like this one, please contact
address@hidden