Merge remote-tracking branch 'origin/master'

d83e22b0 · Weblate · 61068819 · e0efc6d5 · d83e22b0 · d83e22b0
Commit d83e22b0 authored Jul 22, 2015 by Weblate
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

weblate/html/i18n.html weblate/html/i18n.html +1 -0

weblate/lang/data.py weblate/lang/data.py +6 -0

No files found.
--- a/weblate/html/i18n.html
+++ b/weblate/html/i18n.html
@@ -29,6 +29,7 @@ for l in Language.objects.exclude(name__contains='generated').values_list('name'
 {% trans "Asturian" %}
 {% trans "Aymará" %}
 {% trans "Azerbaijani" %}
+{% trans "Bashkir" %}
 {% trans "Basque" %}
 {% trans "Belarusian" %}
 {% trans "Belarusian (latin)" %}

--- a/weblate/lang/data.py
+++ b/weblate/lang/data.py
@@ -341,6 +341,12 @@ EXTRALANGS = (
        2,
        '(n != 1)',
    ),
+    (
+        'ba',
+        u'Bashkir',
+        2,
+        '(n != 1)',
+    ),
    # Wrong language code used by Java
    (
        'in',