From 1c660d0de29fc8b293c6200769aa4b7189f20f6b Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Sat, 23 Aug 2014 11:29:56 +0200
Subject: [PATCH] Added new supported languages

Forward port of 46393980cf from stable/1.7.x
---
 django/conf/global_settings.py              |  3 +++
 django/conf/locale/__init__.py              | 18 ++++++++++++++++++
 django/conf/locale/en/LC_MESSAGES/django.po | 14 +++++++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 0b8cb31454b..1732d0bf436 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -50,6 +50,7 @@ LANGUAGE_CODE = 'en-us'
 LANGUAGES = (
     ('af', gettext_noop('Afrikaans')),
     ('ar', gettext_noop('Arabic')),
+    ('ast', gettext_noop('Asturian')),
     ('az', gettext_noop('Azerbaijani')),
     ('bg', gettext_noop('Bulgarian')),
     ('be', gettext_noop('Belarusian')),
@@ -85,6 +86,7 @@ LANGUAGES = (
     ('hu', gettext_noop('Hungarian')),
     ('ia', gettext_noop('Interlingua')),
     ('id', gettext_noop('Indonesian')),
+    ('io', gettext_noop('Ido')),
     ('is', gettext_noop('Icelandic')),
     ('it', gettext_noop('Italian')),
     ('ja', gettext_noop('Japanese')),
@@ -99,6 +101,7 @@ LANGUAGES = (
     ('mk', gettext_noop('Macedonian')),
     ('ml', gettext_noop('Malayalam')),
     ('mn', gettext_noop('Mongolian')),
+    ('mr', gettext_noop('Marathi')),
     ('my', gettext_noop('Burmese')),
     ('nb', gettext_noop('Norwegian Bokmal')),
     ('ne', gettext_noop('Nepali')),
diff --git a/django/conf/locale/__init__.py b/django/conf/locale/__init__.py
index 13d32c27efb..f2affb22482 100644
--- a/django/conf/locale/__init__.py
+++ b/django/conf/locale/__init__.py
@@ -23,6 +23,12 @@ LANG_INFO = {
         'name': 'Arabic',
         'name_local': 'العربيّة',
     },
+    'ast': {
+        'bidi': False,
+        'code': 'ast',
+        'name': 'Asturian',
+        'name_local': 'asturianu',
+    },
     'az': {
         'bidi': True,
         'code': 'az',
@@ -227,6 +233,12 @@ LANG_INFO = {
         'name': 'Interlingua',
         'name_local': 'Interlingua',
     },
+    'io': {
+        'bidi': False,
+        'code': 'io',
+        'name': 'Ido',
+        'name_local': 'ido',
+    },
     'id': {
         'bidi': False,
         'code': 'id',
@@ -317,6 +329,12 @@ LANG_INFO = {
         'name': 'Mongolian',
         'name_local': 'Mongolian',
     },
+    'mr': {
+        'bidi': False,
+        'code': 'mr',
+        'name': 'Marathi',
+        'name_local': 'मराठी',
+    },
     'my': {
         'bidi': False,
         'code': 'my',
diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index cc5dbee4ab3..8587e1107c6 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-26 13:48+0200\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -21,6 +21,10 @@ msgstr ""
 msgid "Arabic"
 msgstr ""
 
+#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
 #: conf/global_settings.py:53
 msgid "Azerbaijani"
 msgstr ""
@@ -161,6 +165,10 @@ msgstr ""
 msgid "Indonesian"
 msgstr ""
 
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
 #: conf/global_settings.py:88
 msgid "Icelandic"
 msgstr ""
@@ -217,6 +225,10 @@ msgstr ""
 msgid "Mongolian"
 msgstr ""
 
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr ""
+
 #: conf/global_settings.py:102
 msgid "Burmese"
 msgstr ""