Merge remote-tracking branch 'origin/master'

scripts/update-locales

@@ -4,8 +4,8 @@
 set -e
 
 # Update po files itself
-./manage.py makemessages -a -i 'repos/*' -i 'docs/*'
-./manage.py makemessages -a -i 'repos/*' -i 'docs/*' -d djangojs
+./manage.py makemessages -a -i 'repos/*' -i 'docs/*' -i 'examples/*'
+./manage.py makemessages -a -i 'repos/*' -i 'docs/*' -i 'examples/*' -d djangojs
 
 # Fix Report-Msgid-Bugs-To as it gets removed
 sed -i 's/"Report-Msgid-Bugs-To:.*/"Report-Msgid-Bugs-To: weblate@lists.cihar.com\\n"/' locale/*/*/*.po