Merge remote-tracking branch 'origin/master'

lang/data.py

@@ -104,6 +104,12 @@ EXTRALANGS = (
         2,
         'n != 1',
     ),
+    (
+        'zh',
+        'Chinese',
+        1,
+        '0',
+    ),
 )
 
 # List of defaul languages - the ones, where using

weblate/html/i18n.html

@@ -44,6 +44,7 @@ for l in Language.objects.exclude(name__contains='generated').values_list('name'
 {% trans "Bulgarian" %}
 {% trans "Catalan" %}
 {% trans "Central Khmer" %}
+{% trans "Chinese" %}
 {% trans "Chinese (Hong Kong)" %}
 {% trans "Chinese (China)" %}
 {% trans "Chinese (Taiwan)" %}