Merge remote-tracking branch 'origin/master'

ec823161 · Weblate · dc1b20c5 · e5b31d07 · ec823161 · ec823161
Commit ec823161 authored Jan 17, 2016 by Weblate
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

weblate/lang/data.py weblate/lang/data.py +1 -1

No files found.
--- a/weblate/html/i18n.html
+++ b/weblate/html/i18n.html
@@ -24,7 +24,6 @@ for l in Language.objects.exclude(name__contains='generated').values_list('name'
 {% trans "Angika" %}
 {% trans "Arabic" %}
 {% trans "Aragonese" %}
-{% trans "Argentinean Spanish" %}
 {% trans "Armenian" %}
 {% trans "Assamese" %}
 {% trans "Asturian" %}
@@ -173,6 +172,7 @@ for l in Language.objects.exclude(name__contains='generated').values_list('name'
 {% trans "Songhai languages" %}
 {% trans "Sotho" %}
 {% trans "Spanish" %}
+{% trans "Spanish (Argentina)" %}
 {% trans "Sundanese" %}
 {% trans "Swahili" %}
 {% trans "Swedish" %}

--- a/weblate/lang/data.py
+++ b/weblate/lang/data.py
@@ -211,7 +211,7 @@ EXTRALANGS = (
    ),
    (
        'es_AR',
-        'Argentinean Spanish',
+        'Spanish (Argentina)',
        2,
        '(n != 1)',
    ),