summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-07-29 21:54:57 +0200
committerChristian Grothoff <christian@grothoff.org>2017-07-29 21:54:57 +0200
commit83d6043ba3fb3eb25f489f5a10db7778055ae617 (patch)
tree855c818d3ca9f00d03516f8cfb8b11f9f0ee447a /Makefile
parente773fff8a353488d54b394f6926721ccd8f6ae18 (diff)
parentbdc1672325bcd3649c02f9936d2681230a389b7c (diff)
downloadwww-83d6043ba3fb3eb25f489f5a10db7778055ae617.tar.gz
www-83d6043ba3fb3eb25f489f5a10db7778055ae617.tar.bz2
www-83d6043ba3fb3eb25f489f5a10db7778055ae617.zip
resolving merge conflicts
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 7ca561c..904cf2c 100644
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,11 @@ locale/messages.pot: *.j2 common/*.j2 common/*.j2.inc
# Update translation (.po) files with new strings.
locale-update: locale/messages.pot
- pybabel update -i locale/messages.pot -d locale -l en --previous
- pybabel update -i locale/messages.pot -d locale -l de --previous
- pybabel update -i locale/messages.pot -d locale -l fr --previous
- pybabel update -i locale/messages.pot -d locale -l it --previous
- pybabel update -i locale/messages.pot -d locale -l es --previous
+ msgmerge -U -m --previous locale/en/LC_MESSAGES/messages.po locale/messages.pot
+ msgmerge -U -m --previous locale/de/LC_MESSAGES/messages.po locale/messages.pot
+ msgmerge -U -m --previous locale/fr/LC_MESSAGES/messages.po locale/messages.pot
+ msgmerge -U -m --previous locale/es/LC_MESSAGES/messages.po locale/messages.pot
+ msgmerge -U -m --previous locale/it/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