diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 0b86743414..b85d3551b1 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -79,6 +79,7 @@ LANGUAGES = [
('fr', gettext_noop('French')),
('fy', gettext_noop('Frisian')),
('ga', gettext_noop('Irish')),
+ ('gd', gettext_noop('Scottish Gaelic')),
('gl', gettext_noop('Galician')),
('he', gettext_noop('Hebrew')),
('hi', gettext_noop('Hindi')),
diff --git a/django/conf/locale/__init__.py b/django/conf/locale/__init__.py
index 4c95c97942..e19504d324 100644
--- a/django/conf/locale/__init__.py
+++ b/django/conf/locale/__init__.py
@@ -203,6 +203,12 @@ LANG_INFO = {
'name': 'Irish',
'name_local': 'Gaeilge',
},
+ 'gd': {
+ 'bidi': False,
+ 'code': 'gd',
+ 'name': 'Scottish Gaelic',
+ 'name_local': 'Gàidhlig',
+ },
'gl': {
'bidi': False,
'code': 'gl',
diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index f095ed8720..606884eb1f 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/LC_MESSAGES/django.po
@@ -141,6 +141,10 @@ msgstr ""
msgid "Irish"
msgstr ""
+#: conf/global_settings.py:83
+msgid "Scottish Gaelic"
+msgstr ""
+
#: conf/global_settings.py:82
msgid "Galician"
msgstr ""
diff --git a/django/conf/locale/gd/LC_MESSAGES/django.mo b/django/conf/locale/gd/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..c3bb500055
Binary files /dev/null and b/django/conf/locale/gd/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/gd/LC_MESSAGES/django.po b/django/conf/locale/gd/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..e9b2b17d38
--- /dev/null
+++ b/django/conf/locale/gd/LC_MESSAGES/django.po
@@ -0,0 +1,1259 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Michael Bauer, 2014
+# GunChleoc, 2015
+# GunChleoc, 2015
+# GunChleoc, 2014-2015
+# Michael Bauer, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-10-09 17:42+0200\n"
+"PO-Revision-Date: 2015-11-25 18:24+0000\n"
+"Last-Translator: GunChleoc\n"
+"Language-Team: Gaelic, Scottish (http://www.transifex.com/django/django/"
+"language/gd/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gd\n"
+"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
+"(n > 2 && n < 20) ? 2 : 3;\n"
+
+msgid "Afrikaans"
+msgstr "Afraganais"
+
+msgid "Arabic"
+msgstr "Arabais"
+
+msgid "Asturian"
+msgstr "Astùrais"
+
+msgid "Azerbaijani"
+msgstr "Asarbaideànais"
+
+msgid "Bulgarian"
+msgstr "Bulgarais"
+
+msgid "Belarusian"
+msgstr "Bealaruisis"
+
+msgid "Bengali"
+msgstr "Beangailis"
+
+msgid "Breton"
+msgstr "Breatnais"
+
+msgid "Bosnian"
+msgstr "Bosnais"
+
+msgid "Catalan"
+msgstr "Catalanais"
+
+msgid "Czech"
+msgstr "Seacais"
+
+msgid "Welsh"
+msgstr "Cuimris"
+
+msgid "Danish"
+msgstr "Danmhairgis"
+
+msgid "German"
+msgstr "Gearmailtis"
+
+msgid "Greek"
+msgstr "Greugais"
+
+msgid "English"
+msgstr "Beurla"
+
+msgid "Australian English"
+msgstr "Beurla Astràilia"
+
+msgid "British English"
+msgstr "Beurla Bhreatainn"
+
+msgid "Esperanto"
+msgstr "Esperanto"
+
+msgid "Spanish"
+msgstr "Spàinntis"
+
+msgid "Argentinian Spanish"
+msgstr "Spàinntis na h-Argantaine"
+
+msgid "Mexican Spanish"
+msgstr "Spàinntis Mheagsagach"
+
+msgid "Nicaraguan Spanish"
+msgstr "Spàinntis Niocaragua"
+
+msgid "Venezuelan Spanish"
+msgstr "Spàinntis na Bheiniseala"
+
+msgid "Estonian"
+msgstr "Eastoinis"
+
+msgid "Basque"
+msgstr "Basgais"
+
+msgid "Persian"
+msgstr "Farsaidh"
+
+msgid "Finnish"
+msgstr "Fionnlannais"
+
+msgid "French"
+msgstr "Fraingis"
+
+msgid "Frisian"
+msgstr "Frìsis"
+
+msgid "Irish"
+msgstr "Gaeilge"
+
+msgid "Galician"
+msgstr "Gailìsis"
+
+msgid "Hebrew"
+msgstr "Eabhra"
+
+msgid "Hindi"
+msgstr "Hindis"
+
+msgid "Croatian"
+msgstr "Cròthaisis"
+
+msgid "Hungarian"
+msgstr "Ungairis"
+
+msgid "Interlingua"
+msgstr "Interlingua"
+
+msgid "Indonesian"
+msgstr "Innd-Innsis"
+
+msgid "Ido"
+msgstr "Ido"
+
+msgid "Icelandic"
+msgstr "Innis Tìlis"
+
+msgid "Italian"
+msgstr "Eadailtis"
+
+msgid "Japanese"
+msgstr "Seapanais"
+
+msgid "Georgian"
+msgstr "Cairtbheilis"
+
+msgid "Kazakh"
+msgstr "Casachais"
+
+msgid "Khmer"
+msgstr "Cmèar"
+
+msgid "Kannada"
+msgstr "Kannada"
+
+msgid "Korean"
+msgstr "Coirèanais"
+
+msgid "Luxembourgish"
+msgstr "Lugsamburgais"
+
+msgid "Lithuanian"
+msgstr "Liotuainis"
+
+msgid "Latvian"
+msgstr "Laitbheis"
+
+msgid "Macedonian"
+msgstr "Masadonais"
+
+msgid "Malayalam"
+msgstr "Malayalam"
+
+msgid "Mongolian"
+msgstr "Mongolais"
+
+msgid "Marathi"
+msgstr "Marathi"
+
+msgid "Burmese"
+msgstr "Burmais"
+
+msgid "Norwegian Bokmal"
+msgstr "Nirribhis (Bokmål)"
+
+msgid "Nepali"
+msgstr "Neapàlais"
+
+msgid "Dutch"
+msgstr "Duitsis"
+
+msgid "Norwegian Nynorsk"
+msgstr "Nynorsk na Nirribhidh"
+
+msgid "Ossetic"
+msgstr "Ossetic"
+
+msgid "Punjabi"
+msgstr "Panjabi"
+
+msgid "Polish"
+msgstr "Pòlainnis"
+
+msgid "Portuguese"
+msgstr "Portagailis"
+
+msgid "Brazilian Portuguese"
+msgstr "Portagailis Bhraisileach"
+
+msgid "Romanian"
+msgstr "Romàinis"
+
+msgid "Russian"
+msgstr "Ruisis"
+
+msgid "Slovak"
+msgstr "Slòbhacais"
+
+msgid "Slovenian"
+msgstr "Slòbhainis"
+
+msgid "Albanian"
+msgstr "Albàinis"
+
+msgid "Serbian"
+msgstr "Sèirbis"
+
+msgid "Serbian Latin"
+msgstr "Sèirbis (Laideann)"
+
+msgid "Swedish"
+msgstr "Suainis"
+
+msgid "Swahili"
+msgstr "Kiswahili"
+
+msgid "Tamil"
+msgstr "Taimilis"
+
+msgid "Telugu"
+msgstr "Telugu"
+
+msgid "Thai"
+msgstr "Tàidh"
+
+msgid "Turkish"
+msgstr "Turcais"
+
+msgid "Tatar"
+msgstr "Tatarais"
+
+msgid "Udmurt"
+msgstr "Udmurt"
+
+msgid "Ukrainian"
+msgstr "Ucràinis"
+
+msgid "Urdu"
+msgstr "Ùrdu"
+
+msgid "Vietnamese"
+msgstr "Bhiet-Namais"
+
+msgid "Simplified Chinese"
+msgstr "Sìnis Shimplichte"
+
+msgid "Traditional Chinese"
+msgstr "Sìnis Thradaiseanta"
+
+msgid "Messages"
+msgstr "Teachdaireachdan"
+
+msgid "Site Maps"
+msgstr "Mapaichean-làraich"
+
+msgid "Static Files"
+msgstr "Faidhlichean stadastaireachd"
+
+msgid "Syndication"
+msgstr "Siondacaideadh"
+
+msgid "Web Design"
+msgstr "Dealbhadh-lìn"
+
+msgid "Enter a valid value."
+msgstr "Cuir a-steach luach dligheach."
+
+msgid "Enter a valid URL."
+msgstr "Cuir a-steach URL dligheach."
+
+msgid "Enter a valid integer."
+msgstr "Cuir a-steach àireamh slàin dhligheach."
+
+msgid "Enter a valid email address."
+msgstr "Cuir a-steach seòladh puist-d dligheach."
+
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+"Cuir a-steach \"sluga\" dligheach anns nach eil ach litrichean gun sràcan, "
+"àireamhan, fo-loidhnichean is tàthanan."
+
+msgid ""
+"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"hyphens."
+msgstr ""
+"Cuir a-steach \"sluga\" dligheach anns nach eil ach litrichean Unicode, "
+"àireamhan, fo-loidhnichean is tàthanan."
+
+msgid "Enter a valid IPv4 address."
+msgstr "Cuir a-steach seòladh IPv4 dligheach."
+
+msgid "Enter a valid IPv6 address."
+msgstr "Cuir a-steach seòladh IPv6 dligheach."
+
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Cuir a-steach seòladh IPv4 no IPv6 dligheach."
+
+msgid "Enter only digits separated by commas."
+msgstr "Na cuir a-steach ach àireamhan 'gan sgaradh le cromagan."
+
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr ""
+"Dèan cinnteach gu bheil an luach seo %(limit_value)s ('s e %(show_value)s a "
+"th' ann)."
+
+#, python-format
+msgid "Ensure this value is less than or equal to %(limit_value)s."
+msgstr ""
+"Dèan cinnteach gu bheil an luach seo nas lugha na no co-ionnan ri "
+"%(limit_value)s."
+
+#, python-format
+msgid "Ensure this value is greater than or equal to %(limit_value)s."
+msgstr ""
+"Dèan cinnteach gu bheil an luach seo nas motha na no co-ionnan ri "
+"%(limit_value)s."
+
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+"Dèan cinnteach gu bheil %(limit_value)d charactar aig an luach seo air a' "
+"char as lugha (tha %(show_value)d aige an-dràsta)."
+msgstr[1] ""
+"Dèan cinnteach gu bheil %(limit_value)d charactar aig an luach seo air a' "
+"char as lugha (tha %(show_value)d aige an-dràsta)."
+msgstr[2] ""
+"Dèan cinnteach gu bheil %(limit_value)d caractaran aig an luach seo air a' "
+"char as lugha (tha %(show_value)d aige an-dràsta)."
+msgstr[3] ""
+"Dèan cinnteach gu bheil %(limit_value)d caractar aig an luach seo air a' "
+"char as lugha (tha %(show_value)d aige an-dràsta)."
+
+#, python-format
+msgid ""
+"Ensure this value has at most %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+"Dèan cinnteach gu bheil %(limit_value)d charactar aig an luach seo air a' "
+"char as motha (tha %(show_value)d aige an-dràsta)."
+msgstr[1] ""
+"Dèan cinnteach gu bheil %(limit_value)d charactar aig an luach seo air a' "
+"char as motha (tha %(show_value)d aige an-dràsta)."
+msgstr[2] ""
+"Dèan cinnteach gu bheil %(limit_value)d caractaran aig an luach seo air a' "
+"char as motha (tha %(show_value)d aige an-dràsta)."
+msgstr[3] ""
+"Dèan cinnteach gu bheil %(limit_value)d caractar aig an luach seo air a' "
+"char as motha (tha %(show_value)d aige an-dràsta)."
+
+#, python-format
+msgid "Ensure that there are no more than %(max)s digit in total."
+msgid_plural "Ensure that there are no more than %(max)s digits in total."
+msgstr[0] ""
+"Dèan cinnteach nach eil barrachd air %(max)s àireamh ann gu h-iomlan."
+msgstr[1] ""
+"Dèan cinnteach nach eil barrachd air %(max)s àireamh ann gu h-iomlan."
+msgstr[2] ""
+"Dèan cinnteach nach eil barrachd air %(max)s àireamhan ann gu h-iomlan."
+msgstr[3] ""
+"Dèan cinnteach nach eil barrachd air %(max)s àireamh ann gu h-iomlan."
+
+#, python-format
+msgid "Ensure that there are no more than %(max)s decimal place."
+msgid_plural "Ensure that there are no more than %(max)s decimal places."
+msgstr[0] "Dèan cinnteach nach eil barrachd air %(max)s ionad deicheach ann."
+msgstr[1] "Dèan cinnteach nach eil barrachd air %(max)s ionad deicheach ann."
+msgstr[2] "Dèan cinnteach nach eil barrachd air %(max)s ionadan deicheach ann."
+msgstr[3] "Dèan cinnteach nach eil barrachd air %(max)s ionad deicheach ann."
+
+#, python-format
+msgid ""
+"Ensure that there are no more than %(max)s digit before the decimal point."
+msgid_plural ""
+"Ensure that there are no more than %(max)s digits before the decimal point."
+msgstr[0] ""
+"Dèan cinnteach nach eil barrachd air %(max)s àireamh ann ron phuing "
+"dheicheach."
+msgstr[1] ""
+"Dèan cinnteach nach eil barrachd air %(max)s àireamh ann ron phuing "
+"dheicheach."
+msgstr[2] ""
+"Dèan cinnteach nach eil barrachd air %(max)s àireamhan ann ron phuing "
+"dheicheach."
+msgstr[3] ""
+"Dèan cinnteach nach eil barrachd air %(max)s àireamh ann ron phuing "
+"dheicheach."
+
+msgid "and"
+msgstr "agus"
+
+#, python-format
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "Tha %(model_name)s lis a' %(field_labels)s seo ann mar-thà."
+
+#, python-format
+msgid "Value %(value)r is not a valid choice."
+msgstr "Chan eil an luach %(value)r 'na roghainn dhligheach."
+
+msgid "This field cannot be null."
+msgstr "Chan fhaod an raon seo a bhith 'na neoni."
+
+msgid "This field cannot be blank."
+msgstr "Chan fhaod an raon seo a bhith bàn."
+
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "Tha %(model_name)s lis a' %(field_label)s seo ann mar-thà."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+"Chan fhaod %(field_label)s a bhith ann ach aon turas airson "
+"%(date_field_label)s %(lookup_type)s."
+
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Raon dhen t-seòrsa: %(field_type)s"
+
+msgid "Integer"
+msgstr "Àireamh shlàn"
+
+#, python-format
+msgid "'%(value)s' value must be an integer."
+msgstr "Feumaidh \"%(value)s\" a bhith 'na àireamh shlàn."
+
+#, python-format
+msgid "'%(value)s' value must be either True or False."
+msgstr "Feumaidh \"%(value)s\" a bhith True no False."
+
+msgid "Boolean (Either True or False)"
+msgstr "Booleach (True no False)"
+
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr "Sreang (suas ri %(max_length)s)"
+
+msgid "Comma-separated integers"
+msgstr "Àireamhan slàna sgaraichte le cromagan"
+
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+"Tha fòrmat cinn-là mì-dhligheach aig an luach \"%(value)s\". Feumaidh e "
+"bhith san fhòrmat BBBB-MM-LL."
+
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+"Tha fòrmat mar bu chòir (BBBB-MM-LL) aig an luach \"%(value)s\" ach tha an "
+"ceann-là mì-dligheach."
+
+msgid "Date (without time)"
+msgstr "Ceann-là (gun àm)"
+
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"Tha fòrmat mì-dhligheach aig an luach \"%(value)s\". Feumaidh e bhith san "
+"fhòrmat BBBB-MM-LL HH:MM[:dd[.uuuuuu]][TZ]."
+
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+"Tha fòrmat mar bu chòir (BBBB-MM-LL HH:MM[:dd[.uuuuuu]][TZ]) aig an luach "
+"\"%(value)s\" ach tha an ceann-là/an t-àm mì-dligheach."
+
+msgid "Date (with time)"
+msgstr "Ceann-là (le àm)"
+
+#, python-format
+msgid "'%(value)s' value must be a decimal number."
+msgstr "Feumaidh \"%(value)s\" a bhith 'na àireamh dheicheach."
+
+msgid "Decimal number"
+msgstr "Àireamh dheicheach"
+
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"uuuuuu] format."
+msgstr ""
+"Tha fòrmat mì-dhligheach aig an luach \"%(value)s\". Feumaidh e bhith san "
+"fhòrmat [DD] [HH:[MM:]]dd[.uuuuuu]."
+
+msgid "Duration"
+msgstr "Faid"
+
+msgid "Email address"
+msgstr "Seòladh puist-d"
+
+msgid "File path"
+msgstr "Slighe an fhaidhle"
+
+#, python-format
+msgid "'%(value)s' value must be a float."
+msgstr "Feumaidh \"%(value)s\" a bhith 'na àireamh floid."
+
+msgid "Floating point number"
+msgstr "Àireamh le puing floid."
+
+msgid "Big (8 byte) integer"
+msgstr "Mòr-àireamh shlàn (8 baidht)"
+
+msgid "IPv4 address"
+msgstr "Seòladh IPv4"
+
+msgid "IP address"
+msgstr "Seòladh IP"
+
+#, python-format
+msgid "'%(value)s' value must be either None, True or False."
+msgstr "Feumaidh \"%(value)s\" a bhith None, True no False."
+
+msgid "Boolean (Either True, False or None)"
+msgstr "Booleach (True, False no None)"
+
+msgid "Positive integer"
+msgstr "Àireamh shlàn dhearbh"
+
+msgid "Positive small integer"
+msgstr "Beag-àireamh shlàn dhearbh"
+
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Sluga (suas ri %(max_length)s)"
+
+msgid "Small integer"
+msgstr "Beag-àireamh slàn"
+
+msgid "Text"
+msgstr "Teacsa"
+
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+"Tha fòrmat mì-dhligheach aig an luach \"%(value)s\". Feumaidh e bhith san "
+"fhòrmat HH:MM[:dd[.uuuuuu]]."
+
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+"Tha fòrmat mar bu chòir (HH:MM[:dd[.uuuuuu]]) aig an luach \"%(value)s\" ach "
+"tha an t-àm mì-dligheach."
+
+msgid "Time"
+msgstr "Àm"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Raw binary data"
+msgstr "Dàta bìnearaidh amh"
+
+#, python-format
+msgid "'%(value)s' is not a valid UUID."
+msgstr "Chan eil \"%(value)s\" 'na UUID dligheach."
+
+msgid "File"
+msgstr "Faidhle"
+
+msgid "Image"
+msgstr "Dealbh"
+
+#, python-format
+msgid "%(model)s instance with %(field)s %(value)r does not exist."
+msgstr "Chan eil ionstans dhe %(model)s le %(field)s %(value)r ann."
+
+msgid "Foreign Key (type determined by related field)"
+msgstr ""
+" \t\n"
+"Iuchair chèin (thèid a sheòrsa a mhìneachadh leis an raon dàimheach)"
+
+msgid "One-to-one relationship"
+msgstr "Dàimh aonan gu aonan"
+
+msgid "Many-to-many relationship"
+msgstr "Dàimh iomadh rud gu iomadh rud"
+
+#. Translators: If found as last label character, these punctuation
+#. characters will prevent the default label_suffix to be appended to the
+#. label
+msgid ":?.!"
+msgstr ":?.!"
+
+msgid "This field is required."
+msgstr "Tha an raon seo riatanach."
+
+msgid "Enter a whole number."
+msgstr "Cuir a-steach àireamh shlàn."
+
+msgid "Enter a number."
+msgstr "Cuir a-steach àireamh."
+
+msgid "Enter a valid date."
+msgstr "Cuir a-steach ceann-là dligheach."
+
+msgid "Enter a valid time."
+msgstr "Cuir a-steach àm dligheach."
+
+msgid "Enter a valid date/time."
+msgstr "Cuir a-steach ceann-là 's àm dligheach."
+
+msgid "Enter a valid duration."
+msgstr "Cuir a-steach faid dhligheach."
+
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr ""
+"Cha deach faidhle a chur a-null. Dearbhaich seòrsa a' chòdachaidh air an "
+"fhoirm."
+
+msgid "No file was submitted."
+msgstr "Cha deach faidhle a chur a-null."
+
+msgid "The submitted file is empty."
+msgstr "Tha am faidhle a chaidh a chur a-null falamh."
+
+#, python-format
+msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
+msgid_plural ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr[0] ""
+"Dèan cinnteach nach eil barrachd air %(max)d charactar ann an ainm an "
+"fhaidhle (tha %(length)d aige)."
+msgstr[1] ""
+"Dèan cinnteach nach eil barrachd air %(max)d charactar ann an ainm an "
+"fhaidhle (tha %(length)d aige)."
+msgstr[2] ""
+"Dèan cinnteach nach eil barrachd air %(max)d caractaran ann an ainm an "
+"fhaidhle (tha %(length)d aige)."
+msgstr[3] ""
+"Dèan cinnteach nach eil barrachd air %(max)d caractar ann an ainm an "
+"fhaidhle (tha %(length)d aige)."
+
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr ""
+"Cuir a-null faidhle no cuir cromag sa bhogsa fhalamh, na dèan an dà chuidh "
+"dhiubh."
+
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Luchdaich suas dealbh dligheach. Cha robh am faidhle a luchdaich thu suas "
+"'na dhealbh no bha an dealbh coirbte."
+
+#, python-format
+msgid "Select a valid choice. %(value)s is not one of the available choices."
+msgstr "Tagh rud dligheach. Chan eil %(value)s 'na roghainn dhut."
+
+msgid "Enter a list of values."
+msgstr "Cuir a-steach liosta de luachan."
+
+msgid "Enter a complete value."
+msgstr "Cuir a-steach luach slàn."
+
+msgid "Enter a valid UUID."
+msgstr "Cuir a-steach UUID dligheach."
+
+#. Translators: This is the default suffix added to form field labels
+msgid ":"
+msgstr ":"
+
+#, python-format
+msgid "(Hidden field %(name)s) %(error)s"
+msgstr "(Raon falaichte %(name)s) %(error)s"
+
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr "Tha dàta an fhoirm stiùiridh a dhìth no chaidh beantainn ris"
+
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] "Cuir a-null %d fhoirm no nas lugha dhiubh."
+msgstr[1] "Cuir a-null %d fhoirm no nas lugha dhiubh."
+msgstr[2] "Cuir a-null %d foirmean no nas lugha dhiubh."
+msgstr[3] "Cuir a-null %d foirm no nas lugha dhiubh."
+
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "Cuir a-null %d fhoirm no barrachd dhiubh."
+msgstr[1] "Cuir a-null %d fhoirm no barrachd dhiubh."
+msgstr[2] "Cuir a-null %d foirmean no barrachd dhiubh."
+msgstr[3] "Cuir a-null %d foirm no barrachd dhiubh."
+
+msgid "Order"
+msgstr "Òrdugh"
+
+msgid "Delete"
+msgstr "Sguab às"
+
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr "Ceartaich an dàta dùblaichte airson %(field)s."
+
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr ""
+"Ceartaich an dàta dùblaichte airson %(field)s, chan fhaod gach nì a bhith "
+"ann ach aon turas."
+
+#, python-format
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+"Ceartaich an dàta dùblaichte airson %(field_name)s nach fhaod a bhith ann "
+"ach aon turas airson %(lookup)s ann an %(date_field)s."
+
+msgid "Please correct the duplicate values below."
+msgstr "Ceartaich na luachan dùblaichte gu h-ìosal."
+
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr ""
+"Chan eil an iuchair chèin am broinn na loidhne a' freagairt ri prìomh-"
+"iuchair an ionstans-pàraint."
+
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr "Tagh rud dligheach. Chan eil an rud seo 'na roghainn dhut."
+
+#, python-format
+msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgstr "Chan e luach dligheach a tha ann an \"%(pk)s\" airson prìomh-iuchair."
+
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"Cha chiall dha %(datetime)s san roinn-tìde %(current_timezone)s; dh'fhaoidte "
+"gu bheil e dà-sheaghach no nach eil e ann."
+
+msgid "Currently"
+msgstr "An-dràsta"
+
+msgid "Change"
+msgstr "Atharraich"
+
+msgid "Clear"
+msgstr "Falamhaich"
+
+msgid "Unknown"
+msgstr "Chan eil fhios"
+
+msgid "Yes"
+msgstr "Tha"
+
+msgid "No"
+msgstr "Chan eil"
+
+msgid "yes,no,maybe"
+msgstr "yes,no,maybe"
+
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] "%(size)d baidht"
+msgstr[1] "%(size)d baidht"
+msgstr[2] "%(size)d baidht"
+msgstr[3] "%(size)d baidht"
+
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#, python-format
+msgid "%s TB"
+msgstr "%s TB"
+
+#, python-format
+msgid "%s PB"
+msgstr "%s PB"
+
+msgid "p.m."
+msgstr "f"
+
+msgid "a.m."
+msgstr "m"
+
+msgid "PM"
+msgstr "f"
+
+msgid "AM"
+msgstr "m"
+
+msgid "midnight"
+msgstr "meadhan-oidhche"
+
+msgid "noon"
+msgstr "meadhan-latha"
+
+msgid "Monday"
+msgstr "DiLuain"
+
+msgid "Tuesday"
+msgstr "DiMàirt"
+
+msgid "Wednesday"
+msgstr "DiCiadain"
+
+msgid "Thursday"
+msgstr "DiarDaoin"
+
+msgid "Friday"
+msgstr "DihAoine"
+
+msgid "Saturday"
+msgstr "DiSathairne"
+
+msgid "Sunday"
+msgstr "DiDòmhnaich"
+
+msgid "Mon"
+msgstr "DiL"
+
+msgid "Tue"
+msgstr "DiM"
+
+msgid "Wed"
+msgstr "DiC"
+
+msgid "Thu"
+msgstr "Dia"
+
+msgid "Fri"
+msgstr "Dih"
+
+msgid "Sat"
+msgstr "DiS"
+
+msgid "Sun"
+msgstr "DiD"
+
+msgid "January"
+msgstr "Am Faoilleach"
+
+msgid "February"
+msgstr "An Gearran"
+
+msgid "March"
+msgstr "Am Màrt"
+
+msgid "April"
+msgstr "An Giblean"
+
+msgid "May"
+msgstr "An Cèitean"
+
+msgid "June"
+msgstr "An t-Ògmhios"
+
+msgid "July"
+msgstr "An t-Iuchar"
+
+msgid "August"
+msgstr "An Lùnastal"
+
+msgid "September"
+msgstr "An t-Sultain"
+
+msgid "October"
+msgstr "An Dàmhair"
+
+msgid "November"
+msgstr "An t-Samhain"
+
+msgid "December"
+msgstr "An Dùbhlachd"
+
+msgid "jan"
+msgstr "faoi"
+
+msgid "feb"
+msgstr "gearr"
+
+msgid "mar"
+msgstr "màrt"
+
+msgid "apr"
+msgstr "gibl"
+
+msgid "may"
+msgstr "cèit"
+
+msgid "jun"
+msgstr "ògmh"
+
+msgid "jul"
+msgstr "iuch"
+
+msgid "aug"
+msgstr "lùna"
+
+msgid "sep"
+msgstr "sult"
+
+msgid "oct"
+msgstr "dàmh"
+
+msgid "nov"
+msgstr "samh"
+
+msgid "dec"
+msgstr "dùbh"
+
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr "Faoi"
+
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr "Gearr"
+
+msgctxt "abbrev. month"
+msgid "March"
+msgstr "Màrt"
+
+msgctxt "abbrev. month"
+msgid "April"
+msgstr "Gibl"
+
+msgctxt "abbrev. month"
+msgid "May"
+msgstr "Cèit"
+
+msgctxt "abbrev. month"
+msgid "June"
+msgstr "Ògmh"
+
+msgctxt "abbrev. month"
+msgid "July"
+msgstr "Iuch"
+
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr "Lùna"
+
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr "Sult"
+
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr "Dàmh"
+
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr "Samh"
+
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr "Dùbh"
+
+msgctxt "alt. month"
+msgid "January"
+msgstr "Am Faoilleach"
+
+msgctxt "alt. month"
+msgid "February"
+msgstr "An Gearran"
+
+msgctxt "alt. month"
+msgid "March"
+msgstr "Am Màrt"
+
+msgctxt "alt. month"
+msgid "April"
+msgstr "An Giblean"
+
+msgctxt "alt. month"
+msgid "May"
+msgstr "An Cèitean"
+
+msgctxt "alt. month"
+msgid "June"
+msgstr "An t-Ògmhios"
+
+msgctxt "alt. month"
+msgid "July"
+msgstr "An t-Iuchar"
+
+msgctxt "alt. month"
+msgid "August"
+msgstr "An Lùnastal"
+
+msgctxt "alt. month"
+msgid "September"
+msgstr "An t-Sultain"
+
+msgctxt "alt. month"
+msgid "October"
+msgstr "An Dàmhair"
+
+msgctxt "alt. month"
+msgid "November"
+msgstr "An t-Samhain"
+
+msgctxt "alt. month"
+msgid "December"
+msgstr "An Dùbhlachd"
+
+msgid "This is not a valid IPv6 address."
+msgstr "Chan eil seo 'na sheòladh IPv6 dligheach."
+
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+msgid "or"
+msgstr "no"
+
+#. Translators: This string is used as a separator between list elements
+msgid ", "
+msgstr ", "
+
+#, python-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] "%d bhliadhna"
+msgstr[1] "%d bhliadhna"
+msgstr[2] "%d bliadhnaichean"
+msgstr[3] "%d bliadhna"
+
+#, python-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d mhìos"
+msgstr[1] "%d mhìos"
+msgstr[2] "%d mìosan"
+msgstr[3] "%d mìos"
+
+#, python-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d seachdain"
+msgstr[1] "%d sheachdain"
+msgstr[2] "%d seachdainean"
+msgstr[3] "%d seachdain"
+
+#, python-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d latha"
+msgstr[1] "%d latha"
+msgstr[2] "%d làithean"
+msgstr[3] "%d latha"
+
+#, python-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d uair"
+msgstr[1] "%d uair"
+msgstr[2] "%d uairean"
+msgstr[3] "%d uair"
+
+#, python-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d mhionaid"
+msgstr[1] "%d mhionaid"
+msgstr[2] "%d mionaidean"
+msgstr[3] "%d mionaid"
+
+msgid "0 minutes"
+msgstr "0 mionaid"
+
+msgid "Forbidden"
+msgstr "Toirmisgte"
+
+msgid "CSRF verification failed. Request aborted."
+msgstr "Dh'fhàillig le dearbhadh CSRF. chaidh sgur dhen iarrtas."
+
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+"Chì thu an teachdaireachd seo air sgàth 's gu bheil an làrach-lìn HTTPS seo "
+"ag iarraidh air a' bhrabhsair-lìn agad gun cuir e bann-cinn \"Referer\" "
+"thuice ach cha deach gin a chur a-null. Tha feum air a' bhann-chinn seo a "
+"chum tèarainteachd ach nach cleachd treas-phàrtaidh am brabhsair agad gu "
+"droch-rùnach."
+
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+"Ma rèitich thu am brabhsair agad ach an cuir e bannan-cinn \"Referer\" à "
+"comas, cuir an comas iad a-rithist, co-dhiù airson na làraich seo no airson "
+"ceanglaichean HTTPS no airson iarrtasan \"same-origin\"."
+
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+"Chì thu an teachdaireachd seo air sgàth 's gu bheil an làrach-lìn seo ag "
+"iarraidh briosgaid CSRF nuair a chuireas tu foirm a-null. Tha feum air a' "
+"bhriosgaid seo a chum tèarainteachd ach nach cleachd treas-phàrtaidh am "
+"brabhsair agad gu droch-rùnach."
+
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+"Ma rèitich thu am brabhsair agad ach an cuir e briosgaidean à comas, cuir an "
+"comas iad a-rithist, co-dhiù airson na làraich seo no airson iarrtasan "
+"\"same-origin\"."
+
+msgid "More information is available with DEBUG=True."
+msgstr "Gheibh thu barrachd fiosrachaidh le DEBUG=True."
+
+msgid "Welcome to Django"
+msgstr "Fàilte gu Django"
+
+msgid "It worked!"
+msgstr "Dh'obraich e!"
+
+msgid "Congratulations on your first Django-powered page."
+msgstr "Meal do naidheachd gu bheil a' chiad duilleag le cumhachd Django agad."
+
+msgid ""
+"Of course, you haven't actually done any work yet. Next, start your first "
+"app by running python manage.py startapp [app_label]
."
+msgstr ""
+"Gu nàdarra, cha do rinn thu obair dha-rìribh fhathast. Nise, tòisich a' "
+"chiad aplacaid agad 's tu a' ruith python manage.py startapp "
+"[app_label]
."
+
+msgid ""
+"You're seeing this message because you have DEBUG = True
in "
+"your Django settings file and you haven't configured any URLs. Get to work!"
+msgstr ""
+"Chì thu an teachdaireachd seo air sgàth 's gu bheil DEBUG = True"
+"code> ann am faidhle nan roghainnean Django agad agus cha do rèitich thu URL "
+"sam bith fhathast. Siuthad is rèitich fear!"
+
+msgid "No year specified"
+msgstr "Cha deach bliadhna a shònrachadh"
+
+msgid "No month specified"
+msgstr "Cha deach mìos a shònrachadh"
+
+msgid "No day specified"
+msgstr "Cha deach latha a shònrachadh"
+
+msgid "No week specified"
+msgstr "Cha deach seachdain a shònrachadh"
+
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "Chan eil %(verbose_name_plural)s ri fhaighinn"
+
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+"Chan eil %(verbose_name_plural)s san àm ri teachd ri fhaighinn air sgàth 's "
+"gun deach %(class_name)s.allow_future a shuidheachadh air False."
+
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+"Sreang cinn-là \"%(datestr)s\" mì-dhligheach airson an fhòrmait \"%(format)s"
+"\""
+
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "Cha deach %(verbose_name)s a lorg a fhreagras dhan cheist"
+
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+"Chan eil an duilleag 'na \"last\" is cha ghabh a h-iompachadh gu àireamh "
+"shlàn."
+
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Duilleag mhì-dhligheach (%(page_number)s): %(message)s"
+
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
+"Tha liosta fhalamh ann agus chaidh \"%(class_name)s.allow_empty\" a "
+"shuidheachadh air False."
+
+msgid "Directory indexes are not allowed here."
+msgstr "Chan eil clàran-amais pasgain ceadaichte an-seo."
+
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "Chan eil \"%(path)s\" ann"
+
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Clàr-amais dhe %(directory)s"
diff --git a/django/conf/locale/gd/__init__.py b/django/conf/locale/gd/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/django/conf/locale/gd/formats.py b/django/conf/locale/gd/formats.py
new file mode 100644
index 0000000000..0eac972669
--- /dev/null
+++ b/django/conf/locale/gd/formats.py
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+from __future__ import unicode_literals
+
+# The *_FORMAT strings use the Django date format syntax,
+# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+DATE_FORMAT = 'j F Y'
+TIME_FORMAT = 'h:ia'
+DATETIME_FORMAT = 'j F Y h:ia'
+# YEAR_MONTH_FORMAT =
+MONTH_DAY_FORMAT = 'j F'
+SHORT_DATE_FORMAT = 'j M Y'
+SHORT_DATETIME_FORMAT = 'j M Y h:ia'
+FIRST_DAY_OF_WEEK = 1 # Monday
+
+# The *_INPUT_FORMATS strings use the Python strftime format syntax,
+# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
+DECIMAL_SEPARATOR = '.'
+THOUSAND_SEPARATOR = ','
+# NUMBER_GROUPING =
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index d3babbbc3f..ec5840aa57 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -410,7 +410,7 @@ Internationalization
* :ttag:`blocktrans` supports assigning its output to a variable using
``asvar``.
-* A new language is available: Colombian Spanish.
+* Two new languages are available: Colombian Spanish and Scottish Gaelic.
Management Commands
^^^^^^^^^^^^^^^^^^^