Merge remote-tracking branch 'origin/master'

2af9092b · Weblate · c7610cdc · d2ffd0d4 · 2af9092b · 2af9092b
Commit 2af9092b authored Nov 19, 2015 by Weblate
51 changed files
--- a/locale/ach/LC_MESSAGES/django.po
+++ b/locale/ach/LC_MESSAGES/django.po
@@ -1891,7 +1891,7 @@ msgid "Occitan"
 msgstr ""
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/ar/LC_MESSAGES/django.po
+++ b/locale/ar/LC_MESSAGES/django.po
@@ -1911,7 +1911,7 @@ msgid "Occitan"
 msgstr ""
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/ast/LC_MESSAGES/django.po
+++ b/locale/ast/LC_MESSAGES/django.po
@@ -1965,7 +1965,7 @@ msgid "Occitan"
 msgstr ""
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/az/LC_MESSAGES/django.po
+++ b/locale/az/LC_MESSAGES/django.po
@@ -2085,7 +2085,7 @@ msgid "Occitan"
 msgstr "Oksitan"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/be/LC_MESSAGES/django.po
+++ b/locale/be/LC_MESSAGES/django.po
@@ -2019,7 +2019,7 @@ msgid "Occitan"
 msgstr "аксітанская"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/be@latin/LC_MESSAGES/django.po
+++ b/locale/be@latin/LC_MESSAGES/django.po
@@ -2067,7 +2067,7 @@ msgid "Occitan"
 msgstr "aksіtanskaja"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/br/LC_MESSAGES/django.po
+++ b/locale/br/LC_MESSAGES/django.po
@@ -2136,7 +2136,7 @@ msgid "Occitan"
 msgstr "Okitaneg"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/ca/LC_MESSAGES/django.po
+++ b/locale/ca/LC_MESSAGES/django.po
@@ -2039,7 +2039,7 @@ msgid "Occitan"
 msgstr "occità"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/cs/LC_MESSAGES/django.po
+++ b/locale/cs/LC_MESSAGES/django.po
@@ -2002,7 +2002,7 @@ msgid "Occitan"
 msgstr "okcitánština"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/da/LC_MESSAGES/django.po
+++ b/locale/da/LC_MESSAGES/django.po
@@ -2017,7 +2017,7 @@ msgid "Occitan"
 msgstr "Occitansk"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -2050,7 +2050,7 @@ msgid "Occitan"
 msgstr "Okzitanisch"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/django.pot
+++ b/locale/django.pot
@@ -1892,7 +1892,7 @@ msgid "Occitan"
 msgstr ""
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/el/LC_MESSAGES/django.po
+++ b/locale/el/LC_MESSAGES/django.po
@@ -2047,7 +2047,7 @@ msgid "Occitan"
 msgstr "Οτσιτανικά"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/en_GB/LC_MESSAGES/django.po
+++ b/locale/en_GB/LC_MESSAGES/django.po
@@ -1925,7 +1925,7 @@ msgid "Occitan"
 msgstr ""
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/eo/LC_MESSAGES/django.po
+++ b/locale/eo/LC_MESSAGES/django.po
@@ -1901,7 +1901,7 @@ msgid "Occitan"
 msgstr ""
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -2028,7 +2028,7 @@ msgid "Occitan"
 msgstr "Occitano"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/fi/LC_MESSAGES/django.po
+++ b/locale/fi/LC_MESSAGES/django.po
@@ -2048,7 +2048,7 @@ msgid "Occitan"
 msgstr "Oksitaani"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -2048,7 +2048,7 @@ msgid "Occitan"
 msgstr "Occitan"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/fy/LC_MESSAGES/django.po
+++ b/locale/fy/LC_MESSAGES/django.po
@@ -1920,7 +1920,7 @@ msgid "Occitan"
 msgstr "Occitaansk"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/gl/LC_MESSAGES/django.po
+++ b/locale/gl/LC_MESSAGES/django.po
@@ -2060,7 +2060,7 @@ msgid "Occitan"
 msgstr "Occitano"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/he/LC_MESSAGES/django.po
+++ b/locale/he/LC_MESSAGES/django.po
@@ -1988,7 +1988,7 @@ msgid "Occitan"
 msgstr "אוקסיטנית"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/hu/LC_MESSAGES/django.po
+++ b/locale/hu/LC_MESSAGES/django.po
@@ -2050,7 +2050,7 @@ msgid "Occitan"
 msgstr "Okcitán"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/hy/LC_MESSAGES/django.po
+++ b/locale/hy/LC_MESSAGES/django.po
@@ -1895,7 +1895,7 @@ msgid "Occitan"
 msgstr ""
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/id/LC_MESSAGES/django.po
+++ b/locale/id/LC_MESSAGES/django.po
@@ -2144,7 +2144,7 @@ msgid "Occitan"
 msgstr "Oksitan"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/it/LC_MESSAGES/django.po
+++ b/locale/it/LC_MESSAGES/django.po
@@ -1954,7 +1954,7 @@ msgid "Occitan"
 msgstr ""
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/ja/LC_MESSAGES/django.po
+++ b/locale/ja/LC_MESSAGES/django.po
@@ -2094,7 +2094,7 @@ msgid "Occitan"
 msgstr "オック語"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/ko/LC_MESSAGES/django.po
+++ b/locale/ko/LC_MESSAGES/django.po
@@ -2043,7 +2043,7 @@ msgid "Occitan"
 msgstr "오크어"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/ksh/LC_MESSAGES/django.po
+++ b/locale/ksh/LC_MESSAGES/django.po
@@ -1970,7 +1970,7 @@ msgid "Occitan"
 msgstr "Okzetahnesch"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/nb/LC_MESSAGES/django.po
+++ b/locale/nb/LC_MESSAGES/django.po
@@ -1913,7 +1913,7 @@ msgid "Occitan"
 msgstr ""
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/nl/LC_MESSAGES/django.po
+++ b/locale/nl/LC_MESSAGES/django.po
@@ -2032,7 +2032,7 @@ msgid "Occitan"
 msgstr "Occitaans"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/pl/LC_MESSAGES/django.po
+++ b/locale/pl/LC_MESSAGES/django.po
@@ -2034,7 +2034,7 @@ msgid "Occitan"
 msgstr "oksytański"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/pt/LC_MESSAGES/django.po
+++ b/locale/pt/LC_MESSAGES/django.po
@@ -2069,7 +2069,7 @@ msgid "Occitan"
 msgstr "Provençal"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/pt_BR/LC_MESSAGES/django.po
+++ b/locale/pt_BR/LC_MESSAGES/django.po
@@ -2020,7 +2020,7 @@ msgid "Occitan"
 msgstr "Provençal"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/ro/LC_MESSAGES/django.po
+++ b/locale/ro/LC_MESSAGES/django.po
@@ -1952,7 +1952,7 @@ msgid "Occitan"
 msgstr ""
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/ru/LC_MESSAGES/django.po
+++ b/locale/ru/LC_MESSAGES/django.po
@@ -2002,7 +2002,7 @@ msgid "Occitan"
 msgstr ""
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/sk/LC_MESSAGES/django.po
+++ b/locale/sk/LC_MESSAGES/django.po
@@ -2007,7 +2007,7 @@ msgid "Occitan"
 msgstr "Okcitánčina"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/sl/LC_MESSAGES/django.po
+++ b/locale/sl/LC_MESSAGES/django.po
@@ -2009,7 +2009,7 @@ msgid "Occitan"
 msgstr "okcitanščina"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/sq/LC_MESSAGES/django.po
+++ b/locale/sq/LC_MESSAGES/django.po
@@ -1906,7 +1906,7 @@ msgid "Occitan"
 msgstr ""
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/sr/LC_MESSAGES/django.po
+++ b/locale/sr/LC_MESSAGES/django.po
@@ -1976,7 +1976,7 @@ msgid "Occitan"
 msgstr ""
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/sv/LC_MESSAGES/django.po
+++ b/locale/sv/LC_MESSAGES/django.po
@@ -2074,7 +2074,7 @@ msgid "Occitan"
 msgstr "Langue d'oc"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/sw/LC_MESSAGES/django.po
+++ b/locale/sw/LC_MESSAGES/django.po
@@ -1892,7 +1892,7 @@ msgid "Occitan"
 msgstr ""
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/th/LC_MESSAGES/django.po
+++ b/locale/th/LC_MESSAGES/django.po
@@ -1892,7 +1892,7 @@ msgid "Occitan"
 msgstr ""
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/tlh/LC_MESSAGES/django.po
+++ b/locale/tlh/LC_MESSAGES/django.po
@@ -1901,7 +1901,7 @@ msgid "Occitan"
 msgstr ""
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/tr/LC_MESSAGES/django.po
+++ b/locale/tr/LC_MESSAGES/django.po
@@ -2019,7 +2019,7 @@ msgid "Occitan"
 msgstr "Oksitanca"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/uk/LC_MESSAGES/django.po
+++ b/locale/uk/LC_MESSAGES/django.po
@@ -2087,7 +2087,7 @@ msgid "Occitan"
 msgstr "окситанська"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/vi/LC_MESSAGES/django.po
+++ b/locale/vi/LC_MESSAGES/django.po
@@ -1961,7 +1961,7 @@ msgid "Occitan"
 msgstr ""
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -2086,7 +2086,7 @@ msgid "Occitan"
 msgstr "奥克西坦语（Lenga d'òc）"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/locale/zh_Hant/LC_MESSAGES/django.po
+++ b/locale/zh_Hant/LC_MESSAGES/django.po
@@ -1945,7 +1945,7 @@ msgid "Occitan"
 msgstr "Lenga d'òc"
 #: weblate/html/i18n.html:144
-msgid "Ojibwa"
+msgid "Ojibwe"
 msgstr ""
 #: weblate/html/i18n.html:145

--- a/weblate/html/i18n.html
+++ b/weblate/html/i18n.html
@@ -141,7 +141,7 @@ for l in Language.objects.exclude(name__contains='generated').values_list('name'
 {% trans "Norwegian Nynorsk" %}
 {% trans "Nyanja" %}
 {% trans "Occitan" %}
-{% trans "Ojibwa" %}
+{% trans "Ojibwe" %}
 {% trans "Oriya" %}
 {% trans "Ossetian" %}
 {% trans "Papiamento" %}

--- a/weblate/lang/data.py
+++ b/weblate/lang/data.py
@@ -385,7 +385,7 @@ EXTRALANGS = (
    ),
    (
        'oj',
-        'Ojibwa',
+        'Ojibwe',
        2,
        'n != 1',
    ),

--- a/weblate/trans/checks/same.py
+++ b/weblate/trans/checks/same.py
@@ -936,7 +936,7 @@ SAME_BLACKLIST = frozenset((
    'nynorsk',
    'nyanja',
    'occitan',
-    'ojibwa',
+    'ojibwe',
    'oriya',
    'ossetian',
    'papiamento',