Merge remote-tracking branch 'origin/master'

scripts/add-lang

 #!/bin/sh
 
+set -e
+
 ./manage.py makemessages -l $1 -i 'repos/*'
+git add locale/pt_BR/
+git commit -m "Added $1 language"

settings.py

@@ -46,6 +46,7 @@ LANGUAGES = (
     ('fr', u'Français'),
     ('pl', 'Polski'),
     ('tr', u'Türkçe'),
+    ('zh_CN', u'中文'),
 )
 
 SITE_ID = 1