summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-06-02 15:06:03 +0200
committerFlorian Dold <florian.dold@gmail.com>2017-06-02 15:06:03 +0200
commit97ccb2d425facf9d38840873e86984a9b8a26e52 (patch)
tree986b09e4097d3aae23109ef8802b225f82e153b6 /Makefile
parentbec43f19c6713a7f4fe8c5e0b1bd9ffe42722310 (diff)
downloadwww-97ccb2d425facf9d38840873e86984a9b8a26e52.tar.gz
www-97ccb2d425facf9d38840873e86984a9b8a26e52.tar.bz2
www-97ccb2d425facf9d38840873e86984a9b8a26e52.zip
some manual fixes to German translation
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
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