Skip to content
Browse files

Merge branch 'master' of git://github.com/django/django

  • Loading branch information...
2 parents b214954 + 077de98 commit bd2ff5edff6b7718769e283ac41895d6ff983109 @sjl committed Apr 19, 2011
Showing with 5,049 additions and 4,018 deletions.
  1. +2 −1 AUTHORS
  2. +3 −0 MANIFEST.in
  3. +1 −0 README
  4. +1 −1 django/__init__.py
  5. +2 −2 django/conf/__init__.py
  6. +13 −15 django/conf/global_settings.py
  7. +24 −0 django/conf/locale/__init__.py
  8. BIN django/conf/locale/ar/LC_MESSAGES/django.mo
  9. +233 −172 django/conf/locale/ar/LC_MESSAGES/django.po
  10. BIN django/conf/locale/az/LC_MESSAGES/django.mo
  11. +424 −383 django/conf/locale/{no → az}/LC_MESSAGES/django.po
  12. BIN django/conf/locale/bg/LC_MESSAGES/django.mo
  13. +267 −240 django/conf/locale/bg/LC_MESSAGES/django.po
  14. BIN django/conf/locale/bn/LC_MESSAGES/django.mo
  15. +243 −208 django/conf/locale/bn/LC_MESSAGES/django.po
  16. BIN django/conf/locale/bs/LC_MESSAGES/django.mo
  17. +231 −182 django/conf/locale/bs/LC_MESSAGES/django.po
  18. BIN django/conf/locale/ca/LC_MESSAGES/django.mo
  19. +199 −147 django/conf/locale/ca/LC_MESSAGES/django.po
  20. BIN django/conf/locale/cs/LC_MESSAGES/django.mo
  21. +204 −143 django/conf/locale/cs/LC_MESSAGES/django.po
  22. BIN django/conf/locale/cy/LC_MESSAGES/django.mo
  23. +275 −283 django/conf/locale/cy/LC_MESSAGES/django.po
  24. BIN django/conf/locale/da/LC_MESSAGES/django.mo
  25. +206 −160 django/conf/locale/da/LC_MESSAGES/django.po
  26. BIN django/conf/locale/de/LC_MESSAGES/django.mo
  27. +186 −135 django/conf/locale/de/LC_MESSAGES/django.po
  28. BIN django/conf/locale/el/LC_MESSAGES/django.mo
  29. +340 −280 django/conf/locale/el/LC_MESSAGES/django.po
  30. BIN django/conf/locale/en/LC_MESSAGES/django.mo
  31. +179 −111 django/conf/locale/en/LC_MESSAGES/django.po
  32. BIN django/conf/locale/en_GB/LC_MESSAGES/django.mo
  33. +426 −343 django/conf/locale/en_GB/LC_MESSAGES/django.po
  34. BIN django/conf/locale/es/LC_MESSAGES/django.mo
  35. +208 −160 django/conf/locale/es/LC_MESSAGES/django.po
  36. BIN django/conf/locale/es_AR/LC_MESSAGES/django.mo
  37. +190 −141 django/conf/locale/es_AR/LC_MESSAGES/django.po
  38. BIN django/conf/locale/es_MX/LC_MESSAGES/django.mo
  39. +239 −135 django/conf/locale/es_MX/LC_MESSAGES/django.po
  40. 0 django/{db/backends/postgresql → conf/locale/es_MX}/__init__.py
  41. 0 django/{contrib/csrf → conf/locale/es_NI}/__init__.py
  42. +30 −0 django/conf/locale/es_NI/formats.py
  43. BIN django/conf/locale/et/LC_MESSAGES/django.mo
  44. +239 −200 django/conf/locale/et/LC_MESSAGES/django.po
  45. BIN django/conf/locale/eu/LC_MESSAGES/django.mo
  46. +247 −225 django/conf/locale/eu/LC_MESSAGES/django.po
  47. BIN django/conf/locale/fa/LC_MESSAGES/django.mo
  48. +232 −202 django/conf/locale/fa/LC_MESSAGES/django.po
  49. BIN django/conf/locale/fi/LC_MESSAGES/django.mo
  50. +205 −149 django/conf/locale/fi/LC_MESSAGES/django.po
  51. BIN django/conf/locale/fr/LC_MESSAGES/django.mo
Sorry, we could not display the entire diff because too many files (2,638) changed.
View
3 AUTHORS
@@ -24,6 +24,7 @@ The PRIMARY AUTHORS are (and/or have been):
* Ramiro Morales
* Chris Beaven
* Honza Král
+ * Idan Gazit
More information on the main contributors to Django can be found in
docs/internals/committers.txt.
@@ -78,6 +79,7 @@ answer newbie questions, and generally made Django that much better:
Esdras Beleza <linux@esdrasbeleza.com>
Chris Bennett <chrisrbennett@yahoo.com>
James Bennett
+ Shai Berger <shai@platonix.com>
Julian Bez
Arvis Bickovskis <viestards.lists@gmail.com>
Natalia Bidart <nataliabidart@gmail.com>
@@ -189,7 +191,6 @@ answer newbie questions, and generally made Django that much better:
gandalf@owca.info
Marc Garcia <marc.garcia@accopensys.com>
Andy Gayton <andy-django@thecablelounge.com>
- Idan Gazit
geber@datacollect.com
Baishampayan Ghose
Joshua Ginsberg <jag@flowtheory.net>
View
3 MANIFEST.in
@@ -21,11 +21,14 @@ recursive-include django/contrib/auth/tests/templates *
recursive-include django/contrib/comments/templates *
recursive-include django/contrib/databrowse/templates *
recursive-include django/contrib/formtools/templates *
+recursive-include django/contrib/formtools/tests/templates *
recursive-include django/contrib/flatpages/fixtures *
recursive-include django/contrib/flatpages/tests/templates *
recursive-include django/contrib/gis/templates *
recursive-include django/contrib/gis/tests/data *
+recursive-include django/contrib/gis/tests/distapp/fixtures *
recursive-include django/contrib/gis/tests/geoapp/fixtures *
recursive-include django/contrib/gis/tests/geogapp/fixtures *
+recursive-include django/contrib/gis/tests/relatedapp/fixtures *
recursive-include django/contrib/sitemaps/templates *
recursive-include django/contrib/sitemaps/tests/templates *
View
1 README
@@ -44,3 +44,4 @@ To run Django's test suite:
docs/internals/contributing.txt, published online at
http://docs.djangoproject.com/en/dev/internals/contributing/#running-the-unit-tests
+
View
2 django/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 3, 0, 'beta', 1)
+VERSION = (1, 3, 0, 'final', 0)
def get_version():
version = '%s.%s' % (VERSION[0], VERSION[1])
View
4 django/conf/__init__.py
@@ -69,7 +69,7 @@ class BaseSettings(object):
def __setattr__(self, name, value):
if name in ("MEDIA_URL", "STATIC_URL") and value and not value.endswith('/'):
warnings.warn('If set, %s must end with a slash' % name,
- PendingDeprecationWarning)
+ DeprecationWarning)
object.__setattr__(self, name, value)
@@ -86,7 +86,7 @@ def __init__(self, settings_module):
try:
mod = importlib.import_module(self.SETTINGS_MODULE)
except ImportError, e:
- raise ImportError("Could not import settings '%s' (Is it on sys.path? Does it have syntax errors?): %s" % (self.SETTINGS_MODULE, e))
+ raise ImportError("Could not import settings '%s' (Is it on sys.path?): %s" % (self.SETTINGS_MODULE, e))
# Settings that should be converted into tuples if they're mistakenly entered
# as strings.
View
28 django/conf/global_settings.py
@@ -42,6 +42,7 @@
# should be the utf-8 encoded local name for the language.
LANGUAGES = (
('ar', gettext_noop('Arabic')),
+ ('az', gettext_noop('Azerbaijani')),
('bg', gettext_noop('Bulgarian')),
('bn', gettext_noop('Bengali')),
('bs', gettext_noop('Bosnian')),
@@ -56,6 +57,7 @@
('es', gettext_noop('Spanish')),
('es-ar', gettext_noop('Argentinian Spanish')),
('es-mx', gettext_noop('Mexican Spanish')),
+ ('es-ni', gettext_noop('Nicaraguan Spanish')),
('et', gettext_noop('Estonian')),
('eu', gettext_noop('Basque')),
('fa', gettext_noop('Persian')),
@@ -82,7 +84,6 @@
('ml', gettext_noop('Malayalam')),
('mn', gettext_noop('Mongolian')),
('nl', gettext_noop('Dutch')),
- ('no', gettext_noop('Norwegian')),
('nb', gettext_noop('Norwegian Bokmal')),
('nn', gettext_noop('Norwegian Nynorsk')),
('pa', gettext_noop('Punjabi')),
@@ -102,6 +103,7 @@
('th', gettext_noop('Thai')),
('tr', gettext_noop('Turkish')),
('uk', gettext_noop('Ukrainian')),
+ ('ur', gettext_noop('Urdu')),
('vi', gettext_noop('Vietnamese')),
('zh-cn', gettext_noop('Simplified Chinese')),
('zh-tw', gettext_noop('Traditional Chinese')),
@@ -121,7 +123,7 @@
USE_L10N = False
# Not-necessarily-technical managers of the site. They get broken link
-# notifications and other various e-mails.
+# notifications and other various emails.
MANAGERS = ADMINS
# Default content type and charset to use for all HttpResponse objects, if a
@@ -136,12 +138,12 @@
# E-mail address that error messages come from.
SERVER_EMAIL = 'root@localhost'
-# Whether to send broken-link e-mails.
+# Whether to send broken-link emails.
SEND_BROKEN_LINK_EMAILS = False
# Database connection info.
# Legacy format
-DATABASE_ENGINE = '' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+DATABASE_ENGINE = '' # 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
DATABASE_NAME = '' # Or path to database file if using sqlite3.
DATABASE_USER = '' # Not used with sqlite3.
DATABASE_PASSWORD = '' # Not used with sqlite3.
@@ -162,10 +164,10 @@
# to a module that defines an EmailBackend class.
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-# Host for sending e-mail.
+# Host for sending email.
EMAIL_HOST = 'localhost'
-# Port for sending e-mail.
+# Port for sending email.
EMAIL_PORT = 25
# Optional SMTP authentication information for EMAIL_HOST.
@@ -204,7 +206,7 @@
# Output to use in template system for invalid (e.g. misspelled) variables.
TEMPLATE_STRING_IF_INVALID = ''
-# Default e-mail address to use for various automated correspondence from
+# Default email address to use for various automated correspondence from
# the site managers.
DEFAULT_FROM_EMAIL = 'webmaster@localhost'
@@ -459,18 +461,14 @@
# Set to None if you're not using it.
COMMENTS_MODERATORS_GROUP = None
-# The group ID that designates the users whose comments should be e-mailed to MANAGERS.
+# The group ID that designates the users whose comments should be emailed to MANAGERS.
# Set to None if you're not using it.
COMMENTS_SKETCHY_USERS_GROUP = None
-# The system will e-mail MANAGERS the first COMMENTS_FIRST_FEW comments by each
+# The system will email MANAGERS the first COMMENTS_FIRST_FEW comments by each
# user. Set this to 0 if you want to disable it.
COMMENTS_FIRST_FEW = 0
-# A tuple of IP addresses that have been banned from participating in various
-# Django-powered features.
-BANNED_IPS = ()
-
##################
# AUTHENTICATION #
##################
@@ -503,7 +501,7 @@
############
# Class to use as messges backend
-MESSAGE_STORAGE = 'django.contrib.messages.storage.user_messages.LegacyFallbackStorage'
+MESSAGE_STORAGE = 'django.contrib.messages.storage.fallback.FallbackStorage'
# Default values of MESSAGE_LEVEL and MESSAGE_TAGS are defined within
# django.contrib.messages to avoid imports in this settings file.
@@ -528,7 +526,7 @@
}
},
'loggers': {
- 'django.request':{
+ 'django.request': {
'handlers': ['mail_admins'],
'level': 'ERROR',
'propagate': True,
View
24 django/conf/locale/__init__.py
@@ -5,6 +5,12 @@
'name': 'Arabic',
'name_local': u'\u0627\u0644\u0639\u0631\u0628\u064a\u0651\u0629',
},
+ 'az': {
+ 'bidi': True,
+ 'code': 'az',
+ 'name': 'Azerbaijani',
+ 'name_local': u'az\u0259rbaycan dili',
+ },
'bg': {
'bidi': False,
'code': 'bg',
@@ -83,6 +89,18 @@
'name': 'Argentinian Spanish',
'name_local': u'espa\xf1ol de Argentina',
},
+ 'es-mx': {
+ 'bidi': False,
+ 'code': 'es-mx',
+ 'name': 'Mexican Spanish',
+ 'name_local': u'espa\xf1ol de Mexico',
+ },
+ 'es-ni': {
+ 'bidi': False,
+ 'code': 'es-ni',
+ 'name': 'Nicaraguan Spanish',
+ 'name_local': u'espa\xf1ol de Nicaragua',
+ },
'et': {
'bidi': False,
'code': 'et',
@@ -359,6 +377,12 @@
'name': 'Ukrainian',
'name_local': u'\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430',
},
+ 'ur': {
+ 'bidi': False,
+ 'code': 'ur',
+ 'name': 'Urdu',
+ 'name_local': u'\u0627\u0631\u062f\u0648',
+ },
'vi': {
'bidi': False,
'code': 'vi',
View
BIN django/conf/locale/ar/LC_MESSAGES/django.mo
Binary file not shown.
View
405 django/conf/locale/ar/LC_MESSAGES/django.po
@@ -1,322 +1,329 @@
-# translation of django.po to Arabic
-# This file is distributed under the same license as the django package.
+# This file is distributed under the same license as the Django package.
#
-# Ossama M. Khayat <okhayat@yahoo.com>, 2009, 2010.
msgid ""
msgstr ""
-"Project-Id-Version: django\n"
+"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:56+0100\n"
-"PO-Revision-Date: 2010-05-12 11:20+0300\n"
-"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
-"Language-Team: Arabic <support@arabeyes.org>\n"
+"POT-Creation-Date: 2011-03-15 13:06-0400\n"
+"PO-Revision-Date: 2011-03-05 18:42+0000\n"
+"Last-Translator: okhayat <okhayat@gmail.com>\n"
+"Language-Team: Arabic <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=4; plural=(n == 1? 0 : (n == 2? 1 : (n <= 10? 2 : "
-"3)))\n"
-"\n"
-"\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
#: conf/global_settings.py:44
msgid "Arabic"
msgstr "العربيّة"
#: conf/global_settings.py:45
+msgid "Azerbaijani"
+msgstr "الأذربيجانية"
+
+#: conf/global_settings.py:46
msgid "Bulgarian"
msgstr "البلغاريّة"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Bengali"
msgstr "البنغاليّة"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Bosnian"
msgstr "البوسنيّة"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Catalan"
msgstr "الكتلانيّة"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Czech"
msgstr "التشيكيّة"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Welsh"
msgstr "الويلز"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Danish"
msgstr "الدنماركيّة"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "German"
msgstr "الألمانيّة"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Greek"
msgstr "اليونانيّة"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "English"
msgstr "الإنجليزيّة"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
msgid "British English"
msgstr "الإنجليزيّة البريطانيّة"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:57
msgid "Spanish"
msgstr "الإسبانيّة"
-#: conf/global_settings.py:57
-#, fuzzy
+#: conf/global_settings.py:58
msgid "Argentinian Spanish"
-msgstr "الإسبانيّة الأرجنتينيّة"
+msgstr "الأسبانية الأرجنتينية"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:59
+msgid "Mexican Spanish"
+msgstr "الأسبانية المكسيكية"
+
+#: conf/global_settings.py:60
msgid "Estonian"
msgstr "الإستونيّة"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:61
msgid "Basque"
msgstr "الباسك"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:62
msgid "Persian"
msgstr "الفارسيّة"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:63
msgid "Finnish"
msgstr "الفنلنديّة"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:64
msgid "French"
msgstr "الفرنسيّة"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:65
msgid "Frisian"
msgstr "الفريزيّة"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:66
msgid "Irish"
msgstr "الإيرلنديّة"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:67
msgid "Galician"
msgstr "الجليقيّة"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:68
msgid "Hebrew"
msgstr "العبريّة"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:69
msgid "Hindi"
msgstr "الهندية"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:70
msgid "Croatian"
msgstr "الكرواتيّة"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:71
msgid "Hungarian"
msgstr "الهنغاريّة"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:72
msgid "Indonesian"
msgstr "الإندونيسيّة"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:73
msgid "Icelandic"
msgstr "الآيسلنديّة"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:74
msgid "Italian"
msgstr "الإيطاليّة"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:75
msgid "Japanese"
msgstr "اليابانيّة"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:76
msgid "Georgian"
msgstr "الجورجيّة"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:77
msgid "Khmer"
msgstr "الخمر"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:78
msgid "Kannada"
msgstr "الهنديّة (كنّادا)"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:79
msgid "Korean"
msgstr "الكوريّة"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:80
msgid "Lithuanian"
msgstr "اللتوانيّة"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:81
msgid "Latvian"
msgstr "اللاتفيّة"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:82
msgid "Macedonian"
msgstr "المقدونيّة"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:83
msgid "Malayalam"
-msgstr ""
+msgstr "المايالام"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:84
msgid "Mongolian"
msgstr "المنغوليّة"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:85
msgid "Dutch"
msgstr "الهولنديّة"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:86
msgid "Norwegian"
msgstr "النرويجيّة"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:87
msgid "Norwegian Bokmal"
msgstr "البوكمال نرويجيّة"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:88
msgid "Norwegian Nynorsk"
msgstr "النينورسك نرويجيّة"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:89
msgid "Punjabi"
-msgstr ""
+msgstr "البنجابيّة"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:90
msgid "Polish"
msgstr "البولنديّة"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:91
msgid "Portuguese"
msgstr "البرتغاليّة"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:92
msgid "Brazilian Portuguese"
msgstr "البرتغاليّة البرازيليّة"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:93
msgid "Romanian"
msgstr "الرومانيّة"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:94
msgid "Russian"
msgstr "الروسيّة"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:95
msgid "Slovak"
msgstr "السلوفاكيّة"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:96
msgid "Slovenian"
msgstr "السلوفانيّة"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:97
msgid "Albanian"
msgstr "الألبانيّة"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:98
msgid "Serbian"
msgstr "الصربيّة"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:99
msgid "Serbian Latin"
msgstr "اللاتينيّة الصربيّة"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:100
msgid "Swedish"
msgstr "السويديّة"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:101
msgid "Tamil"
msgstr "التاميل"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:102
msgid "Telugu"
msgstr "التيلوغو"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:103
msgid "Thai"
msgstr "التايلنديّة"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:104
msgid "Turkish"
msgstr "التركيّة"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:105
msgid "Ukrainian"
msgstr "الأكرانيّة"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:106
+msgid "Urdu"
+msgstr "الأوردو"
+
+#: conf/global_settings.py:107
msgid "Vietnamese"
msgstr "الفيتناميّة"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:108
msgid "Simplified Chinese"
msgstr "الصينيّة المبسطة"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:109
msgid "Traditional Chinese"
msgstr "الصينيّة التقليدية"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "أدخل قيمة صحيحة."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "أدخل رابطاً صحيحاً."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "يبدو أن هذا الرابط غير متوفر."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "أدخل رابطاً صحيحاً."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "أدخل عنوان بريد إلكتروني صحيح."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أرقام، شرطات سفلية وعاديّة."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "أدخل عنوان IPv4 صحيح."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "أدخل أرقاما فقط مفصول بينها بفواصل."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "تحقق من أن هذه القيمة هي %(limit_value)s (إنها %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "تحقق من أن تكون هذه القيمة أقل من %(limit_value)s أو مساوية لها."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "تحقق من أن تكون هذه القيمة أكثر من %(limit_value)s أو مساوية لها."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -325,7 +332,7 @@ msgstr ""
"تحقق من أن هذه القيمة تحتوي %(limit_value)d أحرف على الأقل (عدد أحرفها %"
"(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -334,17 +341,17 @@ msgstr ""
"تحقق من أن هذه القيمة مكونة من %(limit_value)d أحرف كحد أقصى (عدد أحرفها "
"الآن %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s يجب أن يكون مُميّزاً مع %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "النموذج %(model_name)s والحقل %(field_label)s موجود مسبقاً."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:562
msgid "and"
msgstr "و"
@@ -427,7 +434,7 @@ msgid "E-mail address"
msgstr "عنوان بريد إلكتروني"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "مسار الملف"
@@ -475,24 +482,24 @@ msgstr "رابط"
msgid "XML text"
msgstr "نص XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "النموذج %(model)s ذو الحقل الرئيسي %(pk)r غير موجود."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "الحقل المرتبط (تم تحديد النوع وفقاً للحقل المرتبط)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "علاقة واحد إلى واحد"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "علاقة متعدد إلى متعدد"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -560,7 +567,7 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "رجاءً أرسل ملف أو صح علامة صح عند مربع اختيار \"فارغ\"، وليس كلاهما."
#: forms/fields.py:518
msgid ""
@@ -575,29 +582,29 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "انتق خياراً صحيحاً. %(value)s ليس أحد الخيارات المتاحة."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:985
msgid "Enter a list of values."
msgstr "أدخل قائمة من القيم."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "الترتيب"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "احذف"
-#: forms/models.py:575
+#: forms/models.py:556
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "رجاء صحّح بيانات %(field)s المتكررة."
-#: forms/models.py:579
+#: forms/models.py:560
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "رجاء صحّح بيانات %(field)s المتكررة والتي يجب أن تكون مُميّزة."
-#: forms/models.py:585
+#: forms/models.py:566
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -606,91 +613,91 @@ msgstr ""
"رجاء صحّح بيانات %(field_name)s المتكررة والتي يجب أن تكون مُميّزة لـ%(lookup)s "
"في %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:574
msgid "Please correct the duplicate values below."
msgstr "رجاءً صحّح القيم المُكرّرة أدناه."
-#: forms/models.py:868
+#: forms/models.py:835
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "حقل foreign key المحدد لا يطابق الحقل الرئيسي له."
-#: forms/models.py:929
+#: forms/models.py:896
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "انتق خياراً صحيحاً. اختيارك ليس أحد الخيارات المتاحة."
-#: forms/models.py:1019
+#: forms/models.py:986
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "انتق خياراً صحيحاً. %s ليس أحد الخيارات المتاحة."
-#: forms/models.py:1021
+#: forms/models.py:988
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "القيمة \"%s\" هي صحيحة للحقل المرجعي."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "حالياً:"
+msgstr "حالياً"
#: forms/widgets.py:300
msgid "Change"
msgstr "عدّل"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "سنة"
+msgstr "تفريغ"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "مجهول"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "نعم"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "لا"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:777
msgid "yes,no,maybe"
msgstr "نعم,لا,ربما"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:805 template/defaultfilters.py:810
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
-msgstr[0] "بايت واحد"
-msgstr[1] "بايتان"
-msgstr[2] "%(size)d بايتات"
-msgstr[3] "%(size)d بايت"
-
-#: template/defaultfilters.py:807
+msgstr[0] "%(size)d بايت"
+msgstr[1] "بايت واحد"
+msgstr[2] "بايتان"
+msgstr[3] "%(size)d بايتان"
+msgstr[4] "%(size)d بايت"
+msgstr[5] "%(size)d بايت"
+
+#: template/defaultfilters.py:812
#, python-format
msgid "%s KB"
msgstr "%s ك.ب"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:814
#, python-format
msgid "%s MB"
msgstr "%s م.ب"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:816
#, python-format
msgid "%s GB"
msgstr "%s ج.ب"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:818
+#, python-format
msgid "%s TB"
-msgstr "%s ك.ب"
+msgstr "%s ت.ب"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:819
+#, python-format
msgid "%s PB"
-msgstr "%s ك.ب"
+msgstr "%s ب.ب"
#: utils/dateformat.py:42
msgid "p.m."
@@ -929,73 +936,61 @@ msgid "Dec."
msgstr "ديسمبر"
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "يناير"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "فبراير"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "مارس"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "إبريل"
+msgstr "أبريل"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "مايو"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "يونيو"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "يوليو"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "أغسطس"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "سبتمبر"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "أكتوبر"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "نوفمبر"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "ديسمبر"
@@ -1013,49 +1008,61 @@ msgstr "، "
msgid "year"
msgid_plural "years"
msgstr[0] "سنة"
-msgstr[1] "سنتان"
-msgstr[2] "سنوات"
-msgstr[3] "سنة"
+msgstr[1] "سنة"
+msgstr[2] "سنتان"
+msgstr[3] "سنوات"
+msgstr[4] "سنة"
+msgstr[5] "سنة"
#: utils/timesince.py:22
msgid "month"
msgid_plural "months"
msgstr[0] "شهر"
-msgstr[1] "شهران"
-msgstr[2] "أشهر"
-msgstr[3] "شهر"
+msgstr[1] "شهر"
+msgstr[2] "شهران"
+msgstr[3] "أشهر"
+msgstr[4] "شهر"
+msgstr[5] "شهر"
#: utils/timesince.py:23
msgid "week"
msgid_plural "weeks"
msgstr[0] "أسبوع"
-msgstr[1] "أسبوعان"
-msgstr[2] "أسابيع"
-msgstr[3] "أسبوع"
+msgstr[1] "أسبوع"
+msgstr[2] "أسبوعان"
+msgstr[3] "أسابيع"
+msgstr[4] "أسبوع"
+msgstr[5] "أسبوع"
#: utils/timesince.py:24
msgid "day"
msgid_plural "days"
msgstr[0] "يوم"
-msgstr[1] "يومان"
-msgstr[2] "أيام"
-msgstr[3] "يوم"
+msgstr[1] "يوم"
+msgstr[2] "يومان"
+msgstr[3] "أيام"
+msgstr[4] "يوم"
+msgstr[5] "يوم"
#: utils/timesince.py:25
msgid "hour"
msgid_plural "hours"
msgstr[0] "ساعة"
-msgstr[1] "ساعتان"
-msgstr[2] "ساعات"
-msgstr[3] "ساعة"
+msgstr[1] "ساعة"
+msgstr[2] "ساعتان"
+msgstr[3] "ساعات"
+msgstr[4] "ساعة"
+msgstr[5] "ساعة"
#: utils/timesince.py:26
msgid "minute"
msgid_plural "minutes"
msgstr[0] "دقيقة"
-msgstr[1] "دقيقتان"
-msgstr[2] "دقائق"
-msgstr[3] "دقيقة"
+msgstr[1] "دقيقة"
+msgstr[2] "دقيقتان"
+msgstr[3] "دقائق"
+msgstr[4] "دقيقة"
+msgstr[5] "دقيقة"
#: utils/timesince.py:45
msgid "minutes"
@@ -1071,23 +1078,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr "، %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j F Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j F Y، G:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "G:i:s"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j F"
@@ -1105,3 +1112,57 @@ msgstr "%(verbose_name)s تم تحديثه بنجاح."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s تم حذفه."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr "لم تحدد السنة"
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr "لم تحدد الشهر"
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr "لم تحدد اليوم"
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr "لم تحدد الأسبوع"
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "لا يوجد %(verbose_name_plural)s"
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+"التاريخ بالمستقبل %(verbose_name_plural)s غير متوفر لأن قيمة %(class_name)s."
+"allow_future هي False."
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr "نسق تاريخ غير صحيح '%(datestr)s' محدد بالشكل '%(format)s'"
+
+#: views/generic/detail.py:51
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "لم يعثر على أي %(verbose_name)s مطابقة لهذا الإستعلام"
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr "الصفحة ليست 'الأخيرة'، ولا يمكن تحويل القيمة إلى رقم صحيح."
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr "صفحة غير صحيحة (%(page_number)s)"
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr "قائمة فارغة و '%(class_name)s.allow_empty' قيمته False."
View
BIN django/conf/locale/az/LC_MESSAGES/django.mo
Binary file not shown.
View
807 django/conf/locale/no/LC_MESSAGES/django.po → django/conf/locale/az/LC_MESSAGES/django.po
@@ -1,555 +1,569 @@
-# This is the *old* Norwegian (Bokmål) translation of Django
-# For future updates please use the translation in the "nb" directory.
-# Copyright (C) 2005-2010
# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:00+0100\n"
-"PO-Revision-Date: 2010-03-11 14:22+0100\n"
-"Last-Translator: Christian Mikalsen and Jon Lønne\n"
-"Language-Team: Norsk <no@li.org>\n"
+"POT-Creation-Date: 2011-03-15 13:06-0400\n"
+"PO-Revision-Date: 2011-03-14 08:20+0000\n"
+"Last-Translator: qaralama <ali@ismailov.info>\n"
+"Language-Team: Azerbaijani <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#: conf/global_settings.py:44
msgid "Arabic"
-msgstr "Arabisk"
+msgstr "Ərəbcə"
#: conf/global_settings.py:45
-msgid "Bulgarian"
-msgstr "Bulgarsk"
+msgid "Azerbaijani"
+msgstr ""
#: conf/global_settings.py:46
-msgid "Bengali"
-msgstr "Bengalsk"
+msgid "Bulgarian"
+msgstr "Bolqarca"
#: conf/global_settings.py:47
-msgid "Bosnian"
-msgstr "Bosnisk"
+msgid "Bengali"
+msgstr "Benqalca"
#: conf/global_settings.py:48
-msgid "Catalan"
-msgstr "Katalansk"
+msgid "Bosnian"
+msgstr "Bosniyaca"
#: conf/global_settings.py:49
-msgid "Czech"
-msgstr "Tsjekkisk"
+msgid "Catalan"
+msgstr "Katalanca"
#: conf/global_settings.py:50
-msgid "Welsh"
-msgstr "Walisisk"
+msgid "Czech"
+msgstr "Çexcə"
#: conf/global_settings.py:51
-msgid "Danish"
-msgstr "Dansk"
+msgid "Welsh"
+msgstr "Uelscə"
#: conf/global_settings.py:52
-msgid "German"
-msgstr "Tysk"
+msgid "Danish"
+msgstr "Danimarkaca"
#: conf/global_settings.py:53
-msgid "Greek"
-msgstr "Gresk"
+msgid "German"
+msgstr "Almanca"
#: conf/global_settings.py:54
-msgid "English"
-msgstr "Engelsk"
+msgid "Greek"
+msgstr "Yunanca"
#: conf/global_settings.py:55
-msgid "British English"
-msgstr "Engelsk (britisk)"
+msgid "English"
+msgstr "İngiliscə"
#: conf/global_settings.py:56
-msgid "Spanish"
-msgstr "Spansk"
+msgid "British English"
+msgstr "Britaniya İngiliscəsi"
#: conf/global_settings.py:57
-#, fuzzy
-msgid "Argentinian Spanish"
-msgstr "Argentinsk spansk"
+msgid "Spanish"
+msgstr "İspanca"
#: conf/global_settings.py:58
-msgid "Estonian"
-msgstr "Estisk"
+msgid "Argentinian Spanish"
+msgstr "Argentina İspancası"
#: conf/global_settings.py:59
-msgid "Basque"
-msgstr "Baskisk"
+msgid "Mexican Spanish"
+msgstr ""
#: conf/global_settings.py:60
-msgid "Persian"
-msgstr "Persisk"
+msgid "Estonian"
+msgstr "Estonca"
#: conf/global_settings.py:61
-msgid "Finnish"
-msgstr "Finsk"
+msgid "Basque"
+msgstr "Baskca"
#: conf/global_settings.py:62
-msgid "French"
-msgstr "Fransk"
+msgid "Persian"
+msgstr "Farsca"
#: conf/global_settings.py:63
-msgid "Frisian"
-msgstr "Frisisk"
+msgid "Finnish"
+msgstr "Fincə"
#: conf/global_settings.py:64
-msgid "Irish"
-msgstr "Irsk"
+msgid "French"
+msgstr "Fransızca"
#: conf/global_settings.py:65
-msgid "Galician"
-msgstr "Galisisk"
+msgid "Frisian"
+msgstr "Friscə"
#: conf/global_settings.py:66
-msgid "Hebrew"
-msgstr "Hebraisk"
+msgid "Irish"
+msgstr "İrlandca"
#: conf/global_settings.py:67
-msgid "Hindi"
-msgstr "Hindi"
+msgid "Galician"
+msgstr "Qallik dili"
#: conf/global_settings.py:68
-msgid "Croatian"
-msgstr "Kroatisk"
+msgid "Hebrew"
+msgstr "İbranicə"
#: conf/global_settings.py:69
-msgid "Hungarian"
-msgstr "Ungarsk"
+msgid "Hindi"
+msgstr "Hindcə"
#: conf/global_settings.py:70
-msgid "Indonesian"
-msgstr "Indonesisk"
+msgid "Croatian"
+msgstr "Xorvatca"
#: conf/global_settings.py:71
-msgid "Icelandic"
-msgstr "Islandsk"
+msgid "Hungarian"
+msgstr "Macarca"
#: conf/global_settings.py:72
-msgid "Italian"
-msgstr "Italiensk"
+msgid "Indonesian"
+msgstr "İndonezcə"
#: conf/global_settings.py:73
-msgid "Japanese"
-msgstr "Japansk"
+msgid "Icelandic"
+msgstr "İslandca"
#: conf/global_settings.py:74
-msgid "Georgian"
-msgstr "Georgisk"
+msgid "Italian"
+msgstr "İtalyanca"
#: conf/global_settings.py:75
-msgid "Khmer"
-msgstr "Khmer"
+msgid "Japanese"
+msgstr "Yaponca"
#: conf/global_settings.py:76
-msgid "Kannada"
-msgstr "Kannada"
+msgid "Georgian"
+msgstr "Gürcücə"
#: conf/global_settings.py:77
-msgid "Korean"
-msgstr "Koreansk"
+msgid "Khmer"
+msgstr "Kxmercə"
#: conf/global_settings.py:78
-msgid "Lithuanian"
-msgstr "Litauisk"
+msgid "Kannada"
+msgstr "Kannada dili"
#: conf/global_settings.py:79
-msgid "Latvian"
-msgstr "Latvisk"
+msgid "Korean"
+msgstr "Koreyca"
#: conf/global_settings.py:80
-msgid "Macedonian"
-msgstr "Makedonsk"
+msgid "Lithuanian"
+msgstr "Litva dili"
#: conf/global_settings.py:81
-#, fuzzy
-msgid "Malayalam"
-msgstr "Málaga"
+msgid "Latvian"
+msgstr "Latviya dili"
#: conf/global_settings.py:82
-msgid "Mongolian"
-msgstr "Mongolsk"
+msgid "Macedonian"
+msgstr "Makedonca"
#: conf/global_settings.py:83
-msgid "Dutch"
-msgstr "Nederlandsk"
+msgid "Malayalam"
+msgstr "Malayamca"
#: conf/global_settings.py:84
-msgid "Norwegian"
-msgstr "Norsk"
+msgid "Mongolian"
+msgstr "Monqolca"
#: conf/global_settings.py:85
-msgid "Norwegian Bokmal"
-msgstr "Norsk (bokmål)"
+msgid "Dutch"
+msgstr "Flamandca"
#: conf/global_settings.py:86
-msgid "Norwegian Nynorsk"
-msgstr "Norsk (nynorsk)"
+msgid "Norwegian"
+msgstr "Norveçcə"
#: conf/global_settings.py:87
-msgid "Punjabi"
-msgstr ""
+msgid "Norwegian Bokmal"
+msgstr "Bokmal Norveçcəsi"
#: conf/global_settings.py:88
-msgid "Polish"
-msgstr "Polsk"
+msgid "Norwegian Nynorsk"
+msgstr "Nynorsk Norveçcəsi"
#: conf/global_settings.py:89
-msgid "Portuguese"
-msgstr "Portugisisk"
+msgid "Punjabi"
+msgstr "Pancabicə"
#: conf/global_settings.py:90
-msgid "Brazilian Portuguese"
-msgstr "Brasiliansk portugisisk"
+msgid "Polish"
+msgstr "Polyakca"
#: conf/global_settings.py:91
-msgid "Romanian"
-msgstr "Rumensk"
+msgid "Portuguese"
+msgstr "Portuqalca"
#: conf/global_settings.py:92
-msgid "Russian"
-msgstr "Russisk"
+msgid "Brazilian Portuguese"
+msgstr "Braziliya Portuqalcası"
#: conf/global_settings.py:93
-msgid "Slovak"
-msgstr "Slovakisk"
+msgid "Romanian"
+msgstr "Rumınca"
#: conf/global_settings.py:94
-msgid "Slovenian"
-msgstr "Slovensk"
+msgid "Russian"
+msgstr "Rusca"
#: conf/global_settings.py:95
-msgid "Albanian"
-msgstr "Albansk"
+msgid "Slovak"
+msgstr "Slovakca"
#: conf/global_settings.py:96
-msgid "Serbian"
-msgstr "Serbisk"
+msgid "Slovenian"
+msgstr "Slovencə"
#: conf/global_settings.py:97
-msgid "Serbian Latin"
-msgstr "Serbisk latin"
+msgid "Albanian"
+msgstr "Albanca"
#: conf/global_settings.py:98
-msgid "Swedish"
-msgstr "Svensk"
+msgid "Serbian"
+msgstr "Serbcə"
#: conf/global_settings.py:99
-msgid "Tamil"
-msgstr "Tamil"
+msgid "Serbian Latin"
+msgstr "Serbcə Latın"
#: conf/global_settings.py:100
-msgid "Telugu"
-msgstr "Telugu"
+msgid "Swedish"
+msgstr "İsveçcə"
#: conf/global_settings.py:101
-msgid "Thai"
-msgstr "Thai"
+msgid "Tamil"
+msgstr "Tamilcə"
#: conf/global_settings.py:102
-msgid "Turkish"
-msgstr "Tyrkisk"
+msgid "Telugu"
+msgstr "Teluqu dili"
#: conf/global_settings.py:103
-msgid "Ukrainian"
-msgstr "Ukrainsk"
+msgid "Thai"
+msgstr "Tayca"
#: conf/global_settings.py:104
-msgid "Vietnamese"
-msgstr "Vietnamesisk"
+msgid "Turkish"
+msgstr "Türkcə"
#: conf/global_settings.py:105
-msgid "Simplified Chinese"
-msgstr "Forenklet kinesisk"
+msgid "Ukrainian"
+msgstr "Ukraynaca"
#: conf/global_settings.py:106
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:107
+msgid "Vietnamese"
+msgstr "Vyetnamca"
+
+#: conf/global_settings.py:108
+msgid "Simplified Chinese"
+msgstr "Sadələşdirilmiş Çincə"
+
+#: conf/global_settings.py:109
msgid "Traditional Chinese"
-msgstr "Tradisjonell kinesisk"
+msgstr "Ənənəvi Çincə"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
-msgstr "Oppgi en gyldig verdi."
-
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Oppgi en gyldig nettadresse."
+msgstr "Düzgün qiymət daxil edin."
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
-msgstr "Nettadressen fører til en side som ikke eksisterer."
+msgstr "URL işləmir."
+
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Düzgün URL daxil edin."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
-msgstr "Oppgi en gyldig e-postadresse."
+msgstr "Düzgün e-poçt ünvanı daxil edin."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-"Oppgi en gyldig 'slug' bestående av bokstaver, nummer, understreker eller "
-"bindestreker."
+"Hərflərdən, rəqəmlərdən, alt-xətlərdən və ya defislərdən ibarət düzgün slaq "
+"daxil edin."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
-msgstr "Oppgi en gyldig IPv4-adresse."
+msgstr "Düzgün IPv4 ünvanı daxil edin."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
-msgstr "Oppgi kun tall adskilt med komma."
+msgstr "Vergüllə ayırmaqla yalnız rəqəmlər daxil edin."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr "Verdien må være %(limit_value)s (den er %(show_value)s)."
+msgstr "Əmin edin ki, bu qiymət %(limit_value)s-dir (bu %(show_value)s-dir)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "Verdien må være mindre enn eller lik som %(limit_value)s."
+msgstr ""
+"Bu qiymətin %(limit_value)s-ya bərabər və ya ondan kiçik olduğunu yoxlayın."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "Verdien må være større enn eller lik som %(limit_value)s."
+msgstr ""
+"Bu qiymətin %(limit_value)s-ya bərabər və ya ondan böyük olduğunu yoxlayın."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "Verdien må minimum ha %(limit_value)d tegn (den har %(show_value)d)."
+msgstr ""
+"Bu qiymətin ən azı %(limit_value)d simvoldan ibarət olduğunu yoxlayın (burda "
+"%(show_value)d simvol var)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "Verdien kan maksimalt ha %(limit_value)d tegn (den er %(show_value)d)."
+msgstr ""
+"Bu qiymətin ən çoxu %(limit_value)d simvoldan ibarət olduğunu yoxlayın "
+"(burda %(show_value)d simvol var)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s må være unik for %(date_field)s %(lookup)s."
+msgstr "%(field_name)s %(date_field)s %(lookup)s tarixinə görə özəl olmalıdır."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s med %(field_label)s finnes allerede."
+msgstr "%(model_name)s bu %(field_label)s sahə ilə artıq mövcuddur."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:562
msgid "and"
-msgstr "og"
+msgstr ""
#: db/models/fields/__init__.py:63
#, python-format
msgid "Value %r is not a valid choice."
-msgstr "Verdien %r er ikke et gyldig valg."
+msgstr "%r qiyməti düzgün seçim deyil."
#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
-msgstr "Feltet kan ikke være tomt."
+msgstr "Bu sahə boş qala bilməz."
#: db/models/fields/__init__.py:65
msgid "This field cannot be blank."
-msgstr "Feltet kan ikke være blankt."
+msgstr "Bu sahə ağ qala bilməz."
#: db/models/fields/__init__.py:70
#, python-format
msgid "Field of type: %(field_type)s"
-msgstr "Felt av typen: %(field_type)s"
+msgstr "Sahənin tipi: %(field_type)s"
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:871
#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
#: db/models/fields/__init__.py:1018
msgid "Integer"
-msgstr "Heltall"
+msgstr "Tam ədəd"
#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
msgid "This value must be an integer."
-msgstr "Verdien må være et heltall."
+msgstr "Bu qiymət tam ədəd olmalıdır."
#: db/models/fields/__init__.py:493
msgid "This value must be either True or False."
-msgstr "Verdien må være True eller False."
+msgstr "Bu qiymət ya Doğru, ya da Yalan olmalıdır."
#: db/models/fields/__init__.py:495
msgid "Boolean (Either True or False)"
-msgstr "Boolsk (True eller False)"
+msgstr "Bul (ya Doğru, ya Yalan)"
#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
#, python-format
msgid "String (up to %(max_length)s)"
-msgstr "Tekst (opp til %(max_length)s tegn)"
+msgstr "Sətir (%(max_length)s simvola kimi)"
#: db/models/fields/__init__.py:570
msgid "Comma-separated integers"
-msgstr "Heltall adskilt med komma"
+msgstr "Vergüllə ayrılmış tam ədədlər"
#: db/models/fields/__init__.py:584
msgid "Date (without time)"
-msgstr "Dato (uten tid)"
+msgstr "Tarix (saatsız)"
#: db/models/fields/__init__.py:588
msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Oppgi en gyldig dato på formen ÅÅÅÅ-MM-DD."
+msgstr "İİİİ-AA-GG formatında düzgün tarix daxil edin."
#: db/models/fields/__init__.py:589
#, python-format
msgid "Invalid date: %s"
-msgstr "Ugyldig dato: %s"
+msgstr "Düzgün tarix deyil: %s"
#: db/models/fields/__init__.py:670
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Oppgi dato og tid på formen ÅÅÅÅ-MM-DD TT:MM[:ss[.uuuuuu]]."
+msgstr ""
+"İİİİ-AA-GG SS-DD[:ss[.uuuuuu]] formatında düzgün tarix/vaxt daxil edin."
#: db/models/fields/__init__.py:672
msgid "Date (with time)"
-msgstr "Dato (med tid)"
+msgstr "Tarix (vaxt ilə)"
#: db/models/fields/__init__.py:746
msgid "This value must be a decimal number."
-msgstr "Verdien må være et desimaltall."
+msgstr "Bu rasional ədəd olmalıdır."
#: db/models/fields/__init__.py:748
msgid "Decimal number"
-msgstr "Desimaltall"
+msgstr "Rasional ədəd"
#: db/models/fields/__init__.py:803
msgid "E-mail address"
-msgstr "E-postadresse"
+msgstr "E-poçt ünvanı"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
-msgstr "Filsti"
+msgstr "Faylın ünvanı"
#: db/models/fields/__init__.py:841
msgid "This value must be a float."
-msgstr "Verdien må være et flyttall."
+msgstr ""
#: db/models/fields/__init__.py:843
msgid "Floating point number"
-msgstr "Flyttall"
+msgstr ""
#: db/models/fields/__init__.py:902
msgid "Big (8 byte) integer"
-msgstr "Stort (8 byte) heltall"
+msgstr ""
#: db/models/fields/__init__.py:915
msgid "IP address"
-msgstr "IP-adresse"
+msgstr ""
#: db/models/fields/__init__.py:931
msgid "This value must be either None, True or False."
-msgstr "Verdien må være None, True eller False."
+msgstr ""
#: db/models/fields/__init__.py:933
msgid "Boolean (Either True, False or None)"
-msgstr "Boolsk (True, False eller None)"
+msgstr ""
#: db/models/fields/__init__.py:1024
msgid "Text"
-msgstr "Tekst"
+msgstr ""
#: db/models/fields/__init__.py:1040
msgid "Time"
-msgstr "Tid"
+msgstr ""
#: db/models/fields/__init__.py:1044
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Oppgi tiden på formen TT:MM[:ss[.uuuuuu]]."
+msgstr ""
#: db/models/fields/__init__.py:1120
msgid "URL"
-msgstr "Nettadresse"
+msgstr ""
#: db/models/fields/__init__.py:1136
msgid "XML text"
-msgstr "XML-tekst"
+msgstr ""
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr "Modell %(model)s med primærnøkkelen %(pk)r finnes ikke."
+msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
-msgstr "Fremmednøkkel (type bestemmes av relatert felt)"
+msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
-msgstr "En-til-en-relasjon"
+msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
-msgstr "Mange-til-mange-relasjon"
+msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-"Hold nede \"Control\", eller \"Command\" på en Mac, for å velge mer enn en."
#: forms/fields.py:66
msgid "This field is required."
-msgstr "Feltet er påkrevet."
+msgstr ""
#: forms/fields.py:221
msgid "Enter a whole number."
-msgstr "Oppgi et heltall."
+msgstr ""
#: forms/fields.py:253 forms/fields.py:274
msgid "Enter a number."
-msgstr "Oppgi et tall."
+msgstr ""
#: forms/fields.py:277
#, python-format
msgid "Ensure that there are no more than %s digits in total."
-msgstr "Verdien kan ikke ha mer enn %s siffer totalt."
+msgstr ""
#: forms/fields.py:278
#, python-format
msgid "Ensure that there are no more than %s decimal places."
-msgstr "Verdien kan ikke ha mer enn %s desimaler."
+msgstr ""
#: forms/fields.py:279
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
-msgstr "Verdien kan ikke ha mer enn %s siffer foran komma."
+msgstr ""
#: forms/fields.py:342 forms/fields.py:918
msgid "Enter a valid date."
-msgstr "Oppgi en gyldig dato."
+msgstr ""
#: forms/fields.py:370 forms/fields.py:919
msgid "Enter a valid time."
-msgstr "Oppgi et gyldig tidspunkt."
+msgstr ""
#: forms/fields.py:396
msgid "Enter a valid date/time."
-msgstr "Oppgi gyldig dato og tidspunkt."
+msgstr ""
#: forms/fields.py:460
msgid "No file was submitted. Check the encoding type on the form."
-msgstr "Ingen fil ble sendt. Sjekk \"encoding\"-typen på skjemaet."
+msgstr ""
#: forms/fields.py:461
msgid "No file was submitted."
-msgstr "Ingen fil ble sendt."
+msgstr ""
#: forms/fields.py:462
msgid "The submitted file is empty."
-msgstr "Filen er tom."
+msgstr ""
#: forms/fields.py:463
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr "Filnavnet kan maksimalt ha %(max)d tegn (det har %(length)d)."
+msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
@@ -560,440 +574,421 @@ msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-"Last opp et gyldig bilde. Filen du lastet opp var ødelagt eller ikke et "
-"bilde."
#: forms/fields.py:650 forms/fields.py:725
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "Velg et gyldig valg. %(value)s er ikke et av de tilgjengelige valgene."
+msgstr ""
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:985
msgid "Enter a list of values."
-msgstr "Oppgi en liste med verdier."
+msgstr ""
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
-msgstr "Rekkefølge"
+msgstr ""
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
-msgstr "Slett"
+msgstr ""
-#: forms/models.py:575
+#: forms/models.py:556
#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "Vennligst korriger duplisert data for %(field)s."
+msgstr ""
-#: forms/models.py:579
+#: forms/models.py:560
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr "Vennligst korriger duplisert data for %(field)s, som må være unik."
+msgstr ""
-#: forms/models.py:585
+#: forms/models.py:566
#, 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 ""
-"Vennligst korriger duplisert data for %(field_name)s, som må være unik for %"
-"(lookup)s i %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:574
msgid "Please correct the duplicate values below."
-msgstr "Vennligst korriger de dupliserte verdiene nedenfor."
+msgstr ""
-#: forms/models.py:868
+#: forms/models.py:835
msgid "The inline foreign key did not match the parent instance primary key."
-msgstr "Primærnøkkelen er ikke den samme som foreldreinstansens primærnøkkel."
+msgstr ""
-#: forms/models.py:929
+#: forms/models.py:896
msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Velg et gyldig valg. Valget er ikke et av de tilgjengelige valgene."
+msgstr ""
-#: forms/models.py:1019
+#: forms/models.py:986
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "Velg et gyldig valg. %s er ikke et av de tilgjengelige valgene."
+msgstr ""
-#: forms/models.py:1021
+#: forms/models.py:988
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
-msgstr "\"%s\" er ikke en gyldig verdi for en primærnøkkel."
+msgstr ""
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Nå:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
-msgstr "Endre"
+msgstr ""
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Cáceres"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
-msgstr "Ukjent"
+msgstr ""
-