diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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 |