From 97ccb2d425facf9d38840873e86984a9b8a26e52 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 2 Jun 2017 15:06:03 +0200 Subject: some manual fixes to German translation --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a62eaca..ed41deb 100644 --- a/Makefile +++ b/Makefile @@ -11,11 +11,11 @@ locale/messages.pot: *.j2 # Update translation (.po) files with new strings. locale-update: locale/messages.pot - msgmerge -U locale/en/LC_MESSAGES/messages.po locale/messages.pot - msgmerge -U locale/en/LC_MESSAGES/messages.po locale/messages.pot - msgmerge -U locale/en/LC_MESSAGES/messages.po locale/messages.pot - msgmerge -U locale/en/LC_MESSAGES/messages.po locale/messages.pot - msgmerge -U locale/en/LC_MESSAGES/messages.po locale/messages.pot + msgmerge -U -m --previous locale/en/LC_MESSAGES/messages.po locale/messages.pot + msgmerge -U -m --previous locale/en/LC_MESSAGES/messages.po locale/messages.pot + msgmerge -U -m --previous locale/en/LC_MESSAGES/messages.po locale/messages.pot + msgmerge -U -m --previous locale/en/LC_MESSAGES/messages.po locale/messages.pot + msgmerge -U -m --previous locale/en/LC_MESSAGES/messages.po locale/messages.pot if grep -nA1 '#-#-#-#-#' locale/*/LC_MESSAGES/messages.po; then echo -e "\nERROR: Conflicts encountered in PO files.\n"; exit 1; fi -- cgit v1.2.3