Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into schema-alteration

Conflicts:
	django/db/backends/__init__.py
	django/db/backends/mysql/base.py
	django/db/backends/oracle/base.py
	django/db/backends/oracle/creation.py
	django/db/backends/postgresql_psycopg2/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/fields/related.py
  • Loading branch information...
commit 7f3678dc4cd7146c49bac3fb8f5211f647636aa3 2 parents b62e823 + 93c1576
@andrewgodwin andrewgodwin authored
Showing with 12,491 additions and 7,024 deletions.
  1. +0 −5 .tx/config
  2. +22 −2 AUTHORS
  3. +9 −0 CONTRIBUTING.rst
  4. +0 −1  MANIFEST.in
  5. +1 −1  django/bin/daily_cleanup.py
  6. +14 −50 django/conf/__init__.py
  7. +3 −0  django/conf/app_template/admin.py
  8. +1 −14 django/conf/app_template/tests.py
  9. +2 −0  django/conf/app_template/views.py
  10. +20 −4 django/conf/global_settings.py
  11. +93 −38 django/conf/locale/__init__.py
  12. BIN  django/conf/locale/af/LC_MESSAGES/django.mo
  13. +1,263 −0 django/conf/locale/af/LC_MESSAGES/django.po
  14. BIN  django/conf/locale/ar/LC_MESSAGES/django.mo
  15. +243 −234 django/conf/locale/ar/LC_MESSAGES/django.po
  16. BIN  django/conf/locale/az/LC_MESSAGES/django.mo
  17. +278 −263 django/conf/locale/az/LC_MESSAGES/django.po
  18. BIN  django/conf/locale/be/LC_MESSAGES/django.mo
  19. +1,261 −0 django/conf/locale/be/LC_MESSAGES/django.po
  20. BIN  django/conf/locale/bg/LC_MESSAGES/django.mo
  21. +263 −253 django/conf/locale/bg/LC_MESSAGES/django.po
  22. BIN  django/conf/locale/bn/LC_MESSAGES/django.mo
  23. +308 −297 django/conf/locale/bn/LC_MESSAGES/django.po
  24. +1 −0  django/conf/locale/bn/formats.py
  25. BIN  django/conf/locale/br/LC_MESSAGES/django.mo
  26. +1,259 −0 django/conf/locale/br/LC_MESSAGES/django.po
  27. BIN  django/conf/locale/bs/LC_MESSAGES/django.mo
  28. +242 −233 django/conf/locale/bs/LC_MESSAGES/django.po
  29. +1 −0  django/conf/locale/bs/formats.py
  30. BIN  django/conf/locale/ca/LC_MESSAGES/django.mo
  31. +250 −240 django/conf/locale/ca/LC_MESSAGES/django.po
  32. +3 −0  django/conf/locale/ca/formats.py
  33. BIN  django/conf/locale/cs/LC_MESSAGES/django.mo
  34. +255 −245 django/conf/locale/cs/LC_MESSAGES/django.po
  35. +2 −0  django/conf/locale/cs/formats.py
  36. BIN  django/conf/locale/cy/LC_MESSAGES/django.mo
  37. +298 −287 django/conf/locale/cy/LC_MESSAGES/django.po
  38. +1 −0  django/conf/locale/cy/formats.py
  39. BIN  django/conf/locale/da/LC_MESSAGES/django.mo
  40. +332 −321 django/conf/locale/da/LC_MESSAGES/django.po
  41. +2 −0  django/conf/locale/da/formats.py
  42. BIN  django/conf/locale/de/LC_MESSAGES/django.mo
  43. +249 −240 django/conf/locale/de/LC_MESSAGES/django.po
  44. +2 −0  django/conf/locale/de/formats.py
  45. +1 −0  django/conf/locale/de_CH/formats.py
  46. BIN  django/conf/locale/el/LC_MESSAGES/django.mo
  47. +254 −243 django/conf/locale/el/LC_MESSAGES/django.po
  48. +1 −0  django/conf/locale/el/formats.py
  49. BIN  django/conf/locale/en/LC_MESSAGES/django.mo
  50. +268 −217 django/conf/locale/en/LC_MESSAGES/django.po
  51. +4 −0 django/conf/locale/en/formats.py
  52. BIN  django/conf/locale/en_GB/LC_MESSAGES/django.mo
  53. +248 −239 django/conf/locale/en_GB/LC_MESSAGES/django.po
  54. +4 −0 django/conf/locale/en_GB/formats.py
  55. BIN  django/conf/locale/eo/LC_MESSAGES/django.mo
  56. +310 −300 django/conf/locale/eo/LC_MESSAGES/django.po
  57. BIN  django/conf/locale/es/LC_MESSAGES/django.mo
  58. +389 −376 django/conf/locale/es/LC_MESSAGES/django.po
  59. +3 −0  django/conf/locale/es/formats.py
  60. BIN  django/conf/locale/es_AR/LC_MESSAGES/django.mo
  61. +249 −240 django/conf/locale/es_AR/LC_MESSAGES/django.po
  62. +3 −0  django/conf/locale/es_AR/formats.py
  63. BIN  django/conf/locale/es_MX/LC_MESSAGES/django.mo
  64. +247 −238 django/conf/locale/es_MX/LC_MESSAGES/django.po
  65. +2 −0  django/conf/locale/es_MX/formats.py
  66. +3 −0  django/conf/locale/es_NI/formats.py
  67. 0  {tests/regressiontests/wsgi → django/conf/locale/es_PR}/__init__.py
  68. +30 −0 django/conf/locale/es_PR/formats.py
  69. BIN  django/conf/locale/es_VE/LC_MESSAGES/django.mo
  70. +1,229 −0 django/conf/locale/es_VE/LC_MESSAGES/django.po
  71. BIN  django/conf/locale/et/LC_MESSAGES/django.mo
  72. +243 −234 django/conf/locale/et/LC_MESSAGES/django.po
  73. BIN  django/conf/locale/eu/LC_MESSAGES/django.mo
  74. +286 −279 django/conf/locale/eu/LC_MESSAGES/django.po
  75. +1 −0  django/conf/locale/eu/formats.py
  76. BIN  django/conf/locale/fa/LC_MESSAGES/django.mo
  77. +279 −258 django/conf/locale/fa/LC_MESSAGES/django.po
  78. BIN  django/conf/locale/fi/LC_MESSAGES/django.mo
  79. +243 −234 django/conf/locale/fi/LC_MESSAGES/django.po
  80. BIN  django/conf/locale/fr/LC_MESSAGES/django.mo
  81. +255 −245 django/conf/locale/fr/LC_MESSAGES/django.po
  82. +2 −0  django/conf/locale/fr/formats.py
  83. BIN  django/conf/locale/fy_NL/LC_MESSAGES/django.mo
  84. +240 −231 django/conf/locale/fy_NL/LC_MESSAGES/django.po
  85. +1 −0  django/conf/locale/fy_NL/formats.py
  86. BIN  django/conf/locale/ga/LC_MESSAGES/django.mo
  87. +244 −235 django/conf/locale/ga/LC_MESSAGES/django.po
  88. +1 −0  django/conf/locale/ga/formats.py
  89. BIN  django/conf/locale/gl/LC_MESSAGES/django.mo
  90. +268 −244 django/conf/locale/gl/LC_MESSAGES/django.po
  91. BIN  django/conf/locale/he/LC_MESSAGES/django.mo
  92. +254 −243 django/conf/locale/he/LC_MESSAGES/django.po
  93. BIN  django/conf/locale/hi/LC_MESSAGES/django.mo
  94. +250 −240 django/conf/locale/hi/LC_MESSAGES/django.po
  95. +1 −0  django/conf/locale/hi/formats.py
  96. BIN  django/conf/locale/hr/LC_MESSAGES/django.mo
Sorry, we could not display the entire diff because too many files (5,351) changed.
View
5 .tx/config
@@ -57,11 +57,6 @@ file_filter = django/contrib/humanize/locale/<lang>/LC_MESSAGES/django.po
source_file = django/contrib/humanize/locale/en/LC_MESSAGES/django.po
source_lang = en
-[django.contrib-localflavor]
-file_filter = django/contrib/localflavor/locale/<lang>/LC_MESSAGES/django.po
-source_file = django/contrib/localflavor/locale/en/LC_MESSAGES/django.po
-source_lang = en
-
[django.contrib-messages]
file_filter = django/contrib/messages/locale/<lang>/LC_MESSAGES/django.po
source_file = django/contrib/messages/locale/en/LC_MESSAGES/django.po
View
24 AUTHORS
@@ -34,6 +34,8 @@ The PRIMARY AUTHORS are (and/or have been):
* Jeremy Dunck
* Bryan Veloso
* Preston Holmes
+ * Simon Charette
+ * Donald Stufft
More information on the main contributors to Django can be found in
docs/internals/committers.txt.
@@ -97,7 +99,9 @@ answer newbie questions, and generally made Django that much better:
Natalia Bidart <nataliabidart@gmail.com>
Mark Biggers <biggers@utsl.com>
Paul Bissex <http://e-scribe.com/>
+ Loïc Bistuer <loic.bistuer@sixmedia.com>
Simon Blanchard
+ Craig Blaszczyk <masterjakul@gmail.com>
David Blewett <david@dawninglight.net>
Matt Boersma <matt@sprout.org>
Artem Gnilov <boobsd@gmail.com>
@@ -140,7 +144,10 @@ answer newbie questions, and generally made Django that much better:
colin@owlfish.com
crankycoder@gmail.com
Paul Collier <paul@paul-collier.com>
+ Paul Collins <paul.collins.iii@gmail.com>
Robert Coup
+ Deric Crago <deric.crago@gmail.com>
+ David Cramer <dcramer@gmail.com>
Pete Crosier <pete.crosier@gmail.com>
Matt Croydon <http://www.postneo.com/>
Jure Cuhalev <gandalf@owca.info>
@@ -162,6 +169,7 @@ answer newbie questions, and generally made Django that much better:
Matt Dennenbaum
deric@monowerks.com
Max Derkachev <mderk@yandex.ru>
+ Carlos Matías de la Torre <cmdelatorre@gmail.com>
Rajesh Dhawan <rajesh.dhawan@gmail.com>
Sander Dijkhuis <sander.dijkhuis@gmail.com>
Jordan Dimov <s3x3y1@gmail.com>
@@ -202,6 +210,7 @@ answer newbie questions, and generally made Django that much better:
Stefane Fermgier <sf@fermigier.com>
J. Pablo Fernandez <pupeno@pupeno.com>
Maciej Fijalkowski
+ Juan Pedro Fisanotti <fisadev@gmail.com>
Ben Firshman <ben@firshman.co.uk>
Matthew Flanagan <http://wadofstuff.blogspot.com>
Eric Floehr <eric@intellovations.com>
@@ -303,6 +312,7 @@ answer newbie questions, and generally made Django that much better:
Garth Kidd <http://www.deadlybloodyserious.com/>
kilian <kilian.cavalotti@lip6.fr>
Sune Kirkeby <http://ibofobi.dk/>
+ Hiroki Kiyohara <hirokiky@gmail.com>
Bastian Kleineidam <calvin@debian.org>
Cameron Knight (ckknight)
Nena Kojadin <nena@kiberpipa.org>
@@ -324,6 +334,7 @@ answer newbie questions, and generally made Django that much better:
Denis Kuzmichyov <kuzmichyov@gmail.com>
Panos Laganakos <panos.laganakos@gmail.com>
Nick Lane <nick.lane.au@gmail.com>
+ Łukasz Langa <lukasz@langa.pl>
Stuart Langridge <http://www.kryogenix.org/>
Paul Lanier <planier@google.com>
David Larlet <http://david.larlet.fr>
@@ -358,6 +369,7 @@ answer newbie questions, and generally made Django that much better:
Mike Malone <mjmalone@gmail.com>
Martin Maney <http://www.chipy.org/Martin_Maney>
Michael Manfre <mmanfre@gmail.com>
+ Javier Mansilla <javimansilla@gmail.com>
masonsimon+django@gmail.com
Manuzhai
Petr Marhoun <petr.marhoun@gmail.com>
@@ -378,6 +390,7 @@ answer newbie questions, and generally made Django that much better:
Paul McLanahan <paul@mclanahan.net>
Tobias McNulty <http://www.caktusgroup.com/blog>
Andrews Medina <andrewsmedina@gmail.com>
+ Christoph Mędrela <chris.medrela@gmail.com>
Zain Memon
Christian Metts
michal@plovarna.cz
@@ -414,6 +427,7 @@ answer newbie questions, and generally made Django that much better:
Christian Oudard <christian.oudard@gmail.com>
oggie rob <oz.robharvey@gmail.com>
oggy <ognjen.maric@gmail.com>
+ Tomek Paczkowski <tomek@hauru.eu>
Jens Page
Jay Parlar <parlar@gmail.com>
Carlos Eduardo de Paula <carlosedp@gmail.com>
@@ -423,6 +437,7 @@ answer newbie questions, and generally made Django that much better:
Andreas Pelme <andreas@pelme.se>
permonik@mesias.brnonet.cz
peter@mymart.com
+ Christophe Pettus <xof@thebuild.com>
pgross@thoughtworks.com
phaedo <http://phaedo.cx/>
phil@produxion.net
@@ -461,6 +476,7 @@ answer newbie questions, and generally made Django that much better:
Mike Richardson
Matt Riggott
Alex Robbins <alexander.j.robbins@gmail.com>
+ Matt Robenolt <m@robenolt.com>
Henrique Romano <onaiort@gmail.com>
Armin Ronacher
Daniel Roseman <http://roseman.org.uk/>
@@ -513,6 +529,7 @@ answer newbie questions, and generally made Django that much better:
Johan C. Stöver <johan@nilling.nl>
Nowell Strite <http://nowell.strite.org/>
Thomas Stromberg <tstromberg@google.com>
+ Hannes Struß <x@hannesstruss.de>
Ben Sturmfels <ben@sturm.com.au>
Travis Swicegood <travis@domain51.com>
Pascal Varet
@@ -541,6 +558,7 @@ answer newbie questions, and generally made Django that much better:
Tom Tobin
Joe Topjian <http://joe.terrarum.net/geek/code/python/django/>
torne-django@wolfpuppy.org.uk
+ Matthew Tretter <m@tthewwithanm.com>
Jeff Triplett <jeff.triplett@gmail.com>
tstromberg@google.com
Makoto Tsuyuki <mtsuyuki@gmail.com>
@@ -585,12 +603,13 @@ answer newbie questions, and generally made Django that much better:
ye7cakf02@sneakemail.com
ymasuda@ethercube.com
Jesse Young <adunar@gmail.com>
+ Marc Aymerich Gubern
+ Wiktor Kołodziej <wiktor@pykonik.org>
Mykola Zamkovoi <nickzam@gmail.com>
zegor
Gasper Zejn <zejn@kiberpipa.org>
Jarek Zgoda <jarek.zgoda@gmail.com>
Cheng Zhang
- Hannes Struß <x@hannesstruss.de>
A big THANK YOU goes to:
@@ -601,6 +620,7 @@ A big THANK YOU goes to:
Ian Bicking for convincing Adrian to ditch code generation.
- Mark Pilgrim for diveintopython.org. (RIP!)
+ Mark Pilgrim for "Dive Into Python" (http://diveintopython.net,
+ http://www.diveintopython3.net).
Guido van Rossum for creating Python.
View
9 CONTRIBUTING.rst
@@ -14,3 +14,12 @@ Extensive contribution guidelines are available in the repository at
``docs/internals/contributing/``, or online at:
https://docs.djangoproject.com/en/dev/internals/contributing/
+
+**Warning: pull requests are ignored!** `File a ticket`__ to suggest changes.
+
+__ https://code.djangoproject.com/newticket
+
+Django uses Trac to keep track of bugs, feature requests, and associated
+patches because GitHub doesn't provide adequate tooling for its community.
+Patches can be submitted as pull requests, but if you don't file a ticket,
+it's unlikely that we'll notice your contribution.
View
1  MANIFEST.in
@@ -19,7 +19,6 @@ recursive-include django/contrib/auth/fixtures *
recursive-include django/contrib/auth/templates *
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 *
View
2  django/bin/daily_cleanup.py
@@ -15,5 +15,5 @@
warnings.warn(
"The `daily_cleanup` script has been deprecated "
"in favor of `django-admin.py clearsessions`.",
- PendingDeprecationWarning)
+ DeprecationWarning)
management.call_command('clearsessions')
View
64 django/conf/__init__.py
@@ -8,6 +8,7 @@
import logging
import os
+import sys
import time # Needed for Windows
import warnings
@@ -15,6 +16,7 @@
from django.core.exceptions import ImproperlyConfigured
from django.utils.functional import LazyObject, empty
from django.utils import importlib
+from django.utils.module_loading import import_by_path
from django.utils import six
ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
@@ -56,29 +58,25 @@ def _configure_logging(self):
"""
Setup logging from LOGGING_CONFIG and LOGGING settings.
"""
- try:
- # Route warnings through python logging
- logging.captureWarnings(True)
- # Allow DeprecationWarnings through the warnings filters
- warnings.simplefilter("default", DeprecationWarning)
- except AttributeError:
- # No captureWarnings on Python 2.6, DeprecationWarnings are on anyway
- pass
+ if not sys.warnoptions:
+ try:
+ # Route warnings through python logging
+ logging.captureWarnings(True)
+ # Allow DeprecationWarnings through the warnings filters
+ warnings.simplefilter("default", DeprecationWarning)
+ except AttributeError:
+ # No captureWarnings on Python 2.6, DeprecationWarnings are on anyway
+ pass
if self.LOGGING_CONFIG:
from django.utils.log import DEFAULT_LOGGING
# First find the logging configuration function ...
- logging_config_path, logging_config_func_name = self.LOGGING_CONFIG.rsplit('.', 1)
- logging_config_module = importlib.import_module(logging_config_path)
- logging_config_func = getattr(logging_config_module, logging_config_func_name)
+ logging_config_func = import_by_path(self.LOGGING_CONFIG)
logging_config_func(DEFAULT_LOGGING)
+ # ... then invoke it with the logging settings
if self.LOGGING:
- # Backwards-compatibility shim for #16288 fix
- compat_patch_logging_config(self.LOGGING)
-
- # ... then invoke it with the logging settings
logging_config_func(self.LOGGING)
def configure(self, default_settings=global_settings, **options):
@@ -142,7 +140,7 @@ def __init__(self, settings_module):
isinstance(setting_value, six.string_types):
warnings.warn("The %s setting must be a tuple. Please fix your "
"settings, as auto-correction is now deprecated." % setting,
- PendingDeprecationWarning)
+ DeprecationWarning, stacklevel=2)
setting_value = (setting_value,) # In case the user forgot the comma.
setattr(self, setting, setting_value)
@@ -195,37 +193,3 @@ def __dir__(self):
return list(self.__dict__) + dir(self.default_settings)
settings = LazySettings()
-
-
-
-def compat_patch_logging_config(logging_config):
- """
- Backwards-compatibility shim for #16288 fix. Takes initial value of
- ``LOGGING`` setting and patches it in-place (issuing deprecation warning)
- if "mail_admins" logging handler is configured but has no filters.
-
- """
- # Shim only if LOGGING["handlers"]["mail_admins"] exists,
- # but has no "filters" key
- if "filters" not in logging_config.get(
- "handlers", {}).get(
- "mail_admins", {"filters": []}):
-
- warnings.warn(
- "You have no filters defined on the 'mail_admins' logging "
- "handler: adding implicit debug-false-only filter. "
- "See http://docs.djangoproject.com/en/dev/releases/1.4/"
- "#request-exceptions-are-now-always-logged",
- DeprecationWarning)
-
- filter_name = "require_debug_false"
-
- filters = logging_config.setdefault("filters", {})
- while filter_name in filters:
- filter_name = filter_name + "_"
-
- filters[filter_name] = {
- "()": "django.utils.log.RequireDebugFalse",
- }
-
- logging_config["handlers"]["mail_admins"]["filters"] = [filter_name]
View
3  django/conf/app_template/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
View
15 django/conf/app_template/tests.py
@@ -1,16 +1,3 @@
-"""
-This file demonstrates writing tests using the unittest module. These will pass
-when you run "manage.py test".
-
-Replace this with more appropriate tests for your application.
-"""
-
from django.test import TestCase
-
-class SimpleTest(TestCase):
- def test_basic_addition(self):
- """
- Tests that 1 + 1 always equals 2.
- """
- self.assertEqual(1 + 1, 2)
+# Create your tests here.
View
2  django/conf/app_template/views.py
@@ -1 +1,3 @@
+from django.shortcuts import render
+
# Create your views here.
View
24 django/conf/global_settings.py
@@ -29,6 +29,10 @@
# * Receive x-headers
INTERNAL_IPS = ()
+# Hosts/domain names that are valid for this site.
+# "*" matches anything, ".example.com" matches example.com and all subdomains
+ALLOWED_HOSTS = []
+
# Local time zone for this installation. All choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name (although not all
# systems may support all possibilities). When USE_TZ is True, this is
@@ -42,13 +46,15 @@
# http://www.i18nguy.com/unicode/language-identifiers.html
LANGUAGE_CODE = 'en-us'
-# Languages we provide translations for, out of the box. The language name
-# should be the utf-8 encoded local name for the language.
+# Languages we provide translations for, out of the box.
LANGUAGES = (
+ ('af', gettext_noop('Afrikaans')),
('ar', gettext_noop('Arabic')),
('az', gettext_noop('Azerbaijani')),
('bg', gettext_noop('Bulgarian')),
+ ('be', gettext_noop('Belarusian')),
('bn', gettext_noop('Bengali')),
+ ('br', gettext_noop('Breton')),
('bs', gettext_noop('Bosnian')),
('ca', gettext_noop('Catalan')),
('cs', gettext_noop('Czech')),
@@ -63,6 +69,7 @@
('es-ar', gettext_noop('Argentinian Spanish')),
('es-mx', gettext_noop('Mexican Spanish')),
('es-ni', gettext_noop('Nicaraguan Spanish')),
+ ('es-ve', gettext_noop('Venezuelan Spanish')),
('et', gettext_noop('Estonian')),
('eu', gettext_noop('Basque')),
('fa', gettext_noop('Persian')),
@@ -75,6 +82,7 @@
('hi', gettext_noop('Hindi')),
('hr', gettext_noop('Croatian')),
('hu', gettext_noop('Hungarian')),
+ ('ia', gettext_noop('Interlingua')),
('id', gettext_noop('Indonesian')),
('is', gettext_noop('Icelandic')),
('it', gettext_noop('Italian')),
@@ -84,15 +92,18 @@
('km', gettext_noop('Khmer')),
('kn', gettext_noop('Kannada')),
('ko', gettext_noop('Korean')),
+ ('lb', gettext_noop('Luxembourgish')),
('lt', gettext_noop('Lithuanian')),
('lv', gettext_noop('Latvian')),
('mk', gettext_noop('Macedonian')),
('ml', gettext_noop('Malayalam')),
('mn', gettext_noop('Mongolian')),
+ ('my', gettext_noop('Burmese')),
('nb', gettext_noop('Norwegian Bokmal')),
('ne', gettext_noop('Nepali')),
('nl', gettext_noop('Dutch')),
('nn', gettext_noop('Norwegian Nynorsk')),
+ ('os', gettext_noop('Ossetic')),
('pa', gettext_noop('Punjabi')),
('pl', gettext_noop('Polish')),
('pt', gettext_noop('Portuguese')),
@@ -111,6 +122,7 @@
('th', gettext_noop('Thai')),
('tr', gettext_noop('Turkish')),
('tt', gettext_noop('Tatar')),
+ ('udm', gettext_noop('Udmurt')),
('uk', gettext_noop('Ukrainian')),
('ur', gettext_noop('Urdu')),
('vi', gettext_noop('Vietnamese')),
@@ -147,7 +159,7 @@
# Email address that error messages come from.
SERVER_EMAIL = 'root@localhost'
-# Whether to send broken-link emails.
+# Whether to send broken-link emails. Deprecated, must be removed in 1.8.
SEND_BROKEN_LINK_EMAILS = False
# Database connection info. If left empty, will default to the dummy backend.
@@ -246,7 +258,7 @@
ADMIN_FOR = ()
# List of compiled regular expression objects representing URLs that need not
-# be reported when SEND_BROKEN_LINK_EMAILS is True. Here are a few examples:
+# be reported by BrokenLinkEmailsMiddleware. Here are a few examples:
# import re
# IGNORABLE_404_URLS = (
# re.compile(r'^/apple-touch-icon.*\.png$'),
@@ -355,6 +367,7 @@
# * Note that these format strings are different from the ones to display dates
TIME_INPUT_FORMATS = (
'%H:%M:%S', # '14:30:59'
+ '%H:%M:%S.%f', # '14:30:59.000200'
'%H:%M', # '14:30'
)
@@ -504,9 +517,11 @@
PASSWORD_HASHERS = (
'django.contrib.auth.hashers.PBKDF2PasswordHasher',
'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
+ 'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
'django.contrib.auth.hashers.BCryptPasswordHasher',
'django.contrib.auth.hashers.SHA1PasswordHasher',
'django.contrib.auth.hashers.MD5PasswordHasher',
+ 'django.contrib.auth.hashers.UnsaltedSHA1PasswordHasher',
'django.contrib.auth.hashers.UnsaltedMD5PasswordHasher',
'django.contrib.auth.hashers.CryptPasswordHasher',
)
@@ -530,6 +545,7 @@
CSRF_COOKIE_DOMAIN = None
CSRF_COOKIE_PATH = '/'
CSRF_COOKIE_SECURE = False
+CSRF_COOKIE_HTTPONLY = False
############
# MESSAGES #
View
131 django/conf/locale/__init__.py
@@ -1,32 +1,51 @@
+# -*- encoding: utf-8 -*-
from __future__ import unicode_literals
# About name_local: capitalize it as if your language name was appearing
# inside a sentence in your language.
LANG_INFO = {
+ 'af': {
+ 'bidi': False,
+ 'code': 'af',
+ 'name': 'Afrikaans',
+ 'name_local': 'Afrikaans',
+ },
'ar': {
'bidi': True,
'code': 'ar',
'name': 'Arabic',
- 'name_local': '\u0627\u0644\u0639\u0631\u0628\u064a\u0651\u0629',
+ 'name_local': 'العربيّة',
},
'az': {
'bidi': True,
'code': 'az',
'name': 'Azerbaijani',
- 'name_local': 'az\u0259rbaycan dili',
+ 'name_local': 'azərbaycan dili',
+ },
+ 'be': {
+ 'bidi': False,
+ 'code': 'be',
+ 'name': 'Belarusian',
+ 'name_local': 'беларуская',
},
'bg': {
'bidi': False,
'code': 'bg',
'name': 'Bulgarian',
- 'name_local': '\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438',
+ 'name_local': 'български',
},
'bn': {
'bidi': False,
'code': 'bn',
'name': 'Bengali',
- 'name_local': '\u09ac\u09be\u0982\u09b2\u09be',
+ 'name_local': 'বাংলা',
+ },
+ 'br': {
+ 'bidi': False,
+ 'code': 'br',
+ 'name': 'Breton',
+ 'name_local': 'brezhoneg',
},
'bs': {
'bidi': False,
@@ -38,13 +57,13 @@
'bidi': False,
'code': 'ca',
'name': 'Catalan',
- 'name_local': 'catal\xe0',
+ 'name_local': 'català',
},
'cs': {
'bidi': False,
'code': 'cs',
'name': 'Czech',
- 'name_local': '\u010desky',
+ 'name_local': 'česky',
},
'cy': {
'bidi': False,
@@ -68,7 +87,7 @@
'bidi': False,
'code': 'el',
'name': 'Greek',
- 'name_local': '\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac',
+ 'name_local': 'Ελληνικά',
},
'en': {
'bidi': False,
@@ -92,25 +111,31 @@
'bidi': False,
'code': 'es',
'name': 'Spanish',
- 'name_local': 'espa\xf1ol',
+ 'name_local': 'español',
},
'es-ar': {
'bidi': False,
'code': 'es-ar',
'name': 'Argentinian Spanish',
- 'name_local': 'espa\xf1ol de Argentina',
+ 'name_local': 'español de Argentina',
},
'es-mx': {
'bidi': False,
'code': 'es-mx',
'name': 'Mexican Spanish',
- 'name_local': 'espa\xf1ol de Mexico',
+ 'name_local': 'español de Mexico',
},
'es-ni': {
'bidi': False,
'code': 'es-ni',
'name': 'Nicaraguan Spanish',
- 'name_local': 'espa\xf1ol de Nicaragua',
+ 'name_local': 'español de Nicaragua',
+ },
+ 'es-ve': {
+ 'bidi': False,
+ 'code': 'es-ve',
+ 'name': 'Venezuelan Spanish',
+ 'name_local': 'español de Venezuela',
},
'et': {
'bidi': False,
@@ -128,7 +153,7 @@
'bidi': True,
'code': 'fa',
'name': 'Persian',
- 'name_local': '\u0641\u0627\u0631\u0633\u06cc',
+ 'name_local': 'فارسی',
},
'fi': {
'bidi': False,
@@ -140,7 +165,7 @@
'bidi': False,
'code': 'fr',
'name': 'French',
- 'name_local': 'fran\xe7ais',
+ 'name_local': 'français',
},
'fy-nl': {
'bidi': False,
@@ -164,7 +189,7 @@
'bidi': True,
'code': 'he',
'name': 'Hebrew',
- 'name_local': '\u05e2\u05d1\u05e8\u05d9\u05ea',
+ 'name_local': 'עברית',
},
'hi': {
'bidi': False,
@@ -184,6 +209,12 @@
'name': 'Hungarian',
'name_local': 'Magyar',
},
+ 'ia': {
+ 'bidi': False,
+ 'code': 'ia',
+ 'name': 'Interlingua',
+ 'name_local': 'Interlingua',
+ },
'id': {
'bidi': False,
'code': 'id',
@@ -194,7 +225,7 @@
'bidi': False,
'code': 'is',
'name': 'Icelandic',
- 'name_local': '\xcdslenska',
+ 'name_local': 'Íslenska',
},
'it': {
'bidi': False,
@@ -206,19 +237,19 @@
'bidi': False,
'code': 'ja',
'name': 'Japanese',
- 'name_local': '\u65e5\u672c\u8a9e',
+ 'name_local': '日本語',
},
'ka': {
'bidi': False,
'code': 'ka',
'name': 'Georgian',
- 'name_local': '\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8',
+ 'name_local': 'ქართული',
},
'kk': {
'bidi': False,
'code': 'kk',
'name': 'Kazakh',
- 'name_local': '\u049a\u0430\u0437\u0430\u049b',
+ 'name_local': 'Қазақ',
},
'km': {
'bidi': False,
@@ -236,7 +267,13 @@
'bidi': False,
'code': 'ko',
'name': 'Korean',
- 'name_local': '\ud55c\uad6d\uc5b4',
+ 'name_local': '한국어',
+ },
+ 'lb': {
+ 'bidi': False,
+ 'code': 'lb',
+ 'name': 'Luxembourgish',
+ 'name_local': 'Lëtzebuergesch',
},
'lt': {
'bidi': False,
@@ -248,13 +285,13 @@
'bidi': False,
'code': 'lv',
'name': 'Latvian',
- 'name_local': 'latvie\u0161u',
+ 'name_local': 'latviešu',
},
'mk': {
'bidi': False,
'code': 'mk',
'name': 'Macedonian',
- 'name_local': '\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438',
+ 'name_local': 'Македонски',
},
'ml': {
'bidi': False,
@@ -268,17 +305,23 @@
'name': 'Mongolian',
'name_local': 'Mongolian',
},
+ 'my': {
+ 'bidi': False,
+ 'code': 'my',
+ 'name': 'Burmese',
+ 'name_local': 'မြန်မာဘာသာ',
+ },
'nb': {
'bidi': False,
'code': 'nb',
'name': 'Norwegian Bokmal',
- 'name_local': 'norsk (bokm\xe5l)',
+ 'name_local': 'norsk (bokmål)',
},
'ne': {
'bidi': False,
'code': 'ne',
'name': 'Nepali',
- 'name_local': '\u0928\u0947\u092a\u093e\u0932\u0940',
+ 'name_local': 'नेपाली',
},
'nl': {
'bidi': False,
@@ -298,6 +341,12 @@
'name': 'Norwegian',
'name_local': 'norsk',
},
+ 'os': {
+ 'bidi': False,
+ 'code': 'os',
+ 'name': 'Ossetic',
+ 'name_local': 'Ирон',
+ },
'pa': {
'bidi': False,
'code': 'pa',
@@ -314,37 +363,37 @@
'bidi': False,
'code': 'pt',
'name': 'Portuguese',
- 'name_local': 'Portugu\xeas',
+ 'name_local': 'Português',
},
'pt-br': {
'bidi': False,
'code': 'pt-br',
'name': 'Brazilian Portuguese',
- 'name_local': 'Portugu\xeas Brasileiro',
+ 'name_local': 'Português Brasileiro',
},
'ro': {
'bidi': False,
'code': 'ro',
'name': 'Romanian',
- 'name_local': 'Rom\xe2n\u0103',
+ 'name_local': 'Română',
},
'ru': {
'bidi': False,
'code': 'ru',
'name': 'Russian',
- 'name_local': '\u0420\u0443\u0441\u0441\u043a\u0438\u0439',
+ 'name_local': 'Русский',
},
'sk': {
'bidi': False,
'code': 'sk',
'name': 'Slovak',
- 'name_local': 'slovensk\xfd',
+ 'name_local': 'slovenský',
},
'sl': {
'bidi': False,
'code': 'sl',
'name': 'Slovenian',
- 'name_local': 'Sloven\u0161\u010dina',
+ 'name_local': 'Slovenščina',
},
'sq': {
'bidi': False,
@@ -356,7 +405,7 @@
'bidi': False,
'code': 'sr',
'name': 'Serbian',
- 'name_local': '\u0441\u0440\u043f\u0441\u043a\u0438',
+ 'name_local': 'српски',
},
'sr-latn': {
'bidi': False,
@@ -380,13 +429,13 @@
'bidi': False,
'code': 'ta',
'name': 'Tamil',
- 'name_local': '\u0ba4\u0bae\u0bbf\u0bb4\u0bcd',
+ 'name_local': 'தமிழ்',
},
'te': {
'bidi': False,
'code': 'te',
'name': 'Telugu',
- 'name_local': '\u0c24\u0c46\u0c32\u0c41\u0c17\u0c41',
+ 'name_local': 'తెలుగు',
},
'th': {
'bidi': False,
@@ -398,25 +447,31 @@
'bidi': False,
'code': 'tr',
'name': 'Turkish',
- 'name_local': 'T\xfcrk\xe7e',
+ 'name_local': 'Türkçe',
},
'tt': {
'bidi': False,
'code': 'tt',
'name': 'Tatar',
- 'name_local': '\u0422\u0430\u0442\u0430\u0440\u0447\u0430',
+ 'name_local': 'Татарча',
+ },
+ 'udm': {
+ 'bidi': False,
+ 'code': 'udm',
+ 'name': 'Udmurt',
+ 'name_local': 'Удмурт',
},
'uk': {
'bidi': False,
'code': 'uk',
'name': 'Ukrainian',
- 'name_local': '\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430',
+ 'name_local': 'Українська',
},
'ur': {
'bidi': False,
'code': 'ur',
'name': 'Urdu',
- 'name_local': '\u0627\u0631\u062f\u0648',
+ 'name_local': 'اردو',
},
'vi': {
'bidi': False,
@@ -428,12 +483,12 @@
'bidi': False,
'code': 'zh-cn',
'name': 'Simplified Chinese',
- 'name_local': '\u7b80\u4f53\u4e2d\u6587',
+ 'name_local': '简体中文',
},
'zh-tw': {
'bidi': False,
'code': 'zh-tw',
'name': 'Traditional Chinese',
- 'name_local': '\u7e41\u9ad4\u4e2d\u6587',
+ 'name_local': '繁體中文',
}
}
View
BIN  django/conf/locale/af/LC_MESSAGES/django.mo
Binary file not shown
View
1,263 django/conf/locale/af/LC_MESSAGES/django.po
@@ -0,0 +1,1263 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Piet Delport <pjdelport@gmail.com>, 2012-2013.
+# Stephen Cox <scox@rems2.com>, 2011, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-03-26 06:50+0000\n"
+"Last-Translator: Piet Delport <pjdelport@gmail.com>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/django/"
+"language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: conf/global_settings.py:49
+msgid "Arabic"
+msgstr "Arabies"
+
+#: conf/global_settings.py:50
+msgid "Azerbaijani"
+msgstr "Aserbeidjans"
+
+#: conf/global_settings.py:51
+msgid "Bulgarian"
+msgstr "Bulgaars"
+
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Wit-Russies"
+
+#: conf/global_settings.py:53
+msgid "Bengali"
+msgstr "Bengali"
+
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Bretons"
+
+#: conf/global_settings.py:55
+msgid "Bosnian"
+msgstr "Bosnies"
+
+#: conf/global_settings.py:56
+msgid "Catalan"
+msgstr "Katalaans"
+
+#: conf/global_settings.py:57
+msgid "Czech"
+msgstr "Tsjeggies"
+
+#: conf/global_settings.py:58
+msgid "Welsh"
+msgstr "Welsh"
+
+#: conf/global_settings.py:59
+msgid "Danish"
+msgstr "Deens"
+
+#: conf/global_settings.py:60
+msgid "German"
+msgstr "Duits"
+
+#: conf/global_settings.py:61
+msgid "Greek"
+msgstr "Grieks"
+
+#: conf/global_settings.py:62
+msgid "English"
+msgstr "Engels"
+
+#: conf/global_settings.py:63
+msgid "British English"
+msgstr "Britse Engels"
+
+#: conf/global_settings.py:64
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: conf/global_settings.py:65
+msgid "Spanish"
+msgstr "Spaans"
+
+#: conf/global_settings.py:66
+msgid "Argentinian Spanish"
+msgstr "Argentynse Spaans"
+
+#: conf/global_settings.py:67
+msgid "Mexican Spanish"
+msgstr "Meksikaanse Spaans"
+
+#: conf/global_settings.py:68
+msgid "Nicaraguan Spanish"
+msgstr "Nicaraguaanse Spaans"
+
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Venezolaanse Spaans"
+
+#: conf/global_settings.py:70
+msgid "Estonian"
+msgstr "Estnies"
+
+#: conf/global_settings.py:71
+msgid "Basque"
+msgstr "Baskies"
+
+#: conf/global_settings.py:72
+msgid "Persian"
+msgstr "Persies"
+
+#: conf/global_settings.py:73
+msgid "Finnish"
+msgstr "Fins"
+
+#: conf/global_settings.py:74
+msgid "French"
+msgstr "Fraans"
+
+#: conf/global_settings.py:75
+msgid "Frisian"
+msgstr "Fries"
+
+#: conf/global_settings.py:76
+msgid "Irish"
+msgstr "Iers"
+
+#: conf/global_settings.py:77
+msgid "Galician"
+msgstr "Galicies"
+
+#: conf/global_settings.py:78
+msgid "Hebrew"
+msgstr "Hebreeus"
+
+#: conf/global_settings.py:79
+msgid "Hindi"
+msgstr "Hindoe"
+
+#: conf/global_settings.py:80
+msgid "Croatian"
+msgstr "Kroaties"
+
+#: conf/global_settings.py:81
+msgid "Hungarian"
+msgstr "Hongaars"
+
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:83
+msgid "Indonesian"
+msgstr "Indonesies"
+
+#: conf/global_settings.py:84
+msgid "Icelandic"
+msgstr "Yslands"
+
+#: conf/global_settings.py:85
+msgid "Italian"
+msgstr "Italiaans"
+
+#: conf/global_settings.py:86
+msgid "Japanese"
+msgstr "Japannees"
+
+#: conf/global_settings.py:87
+msgid "Georgian"
+msgstr "Georgian"
+
+#: conf/global_settings.py:88
+msgid "Kazakh"
+msgstr "Kazakh"
+
+#: conf/global_settings.py:89
+msgid "Khmer"
+msgstr "Khmer"
+
+#: conf/global_settings.py:90
+msgid "Kannada"
+msgstr "Kannada"
+
+#: conf/global_settings.py:91
+msgid "Korean"
+msgstr "Koreaanse"
+
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Luxemburgs"
+
+#: conf/global_settings.py:93
+msgid "Lithuanian"
+msgstr "Litaus"
+
+#: conf/global_settings.py:94
+msgid "Latvian"
+msgstr "Lets"
+
+#: conf/global_settings.py:95
+msgid "Macedonian"
+msgstr "Macedonies"
+
+#: conf/global_settings.py:96
+msgid "Malayalam"
+msgstr "Malabaars"
+
+#: conf/global_settings.py:97
+msgid "Mongolian"
+msgstr "Mongools"
+
+#: conf/global_settings.py:98
+msgid "Norwegian Bokmal"
+msgstr "Noors Bokmal"
+
+#: conf/global_settings.py:99
+msgid "Nepali"
+msgstr "Nepalees"
+
+#: conf/global_settings.py:100
+msgid "Dutch"
+msgstr "Nederlands"
+
+#: conf/global_settings.py:101
+msgid "Norwegian Nynorsk"
+msgstr "Noorweegse Nynorsk"
+
+#: conf/global_settings.py:102
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: conf/global_settings.py:103
+msgid "Polish"
+msgstr "Pools"
+
+#: conf/global_settings.py:104
+msgid "Portuguese"
+msgstr "Portugees"
+
+#: conf/global_settings.py:105
+msgid "Brazilian Portuguese"
+msgstr "Brasiliaanse Portugees"
+
+#: conf/global_settings.py:106
+msgid "Romanian"
+msgstr "Roemeens"
+
+#: conf/global_settings.py:107
+msgid "Russian"
+msgstr "Russiese"
+
+#: conf/global_settings.py:108
+msgid "Slovak"
+msgstr "Slowaakse"
+
+#: conf/global_settings.py:109
+msgid "Slovenian"
+msgstr "Sloveens"
+
+#: conf/global_settings.py:110
+msgid "Albanian"
+msgstr "Albanees"
+
+#: conf/global_settings.py:111
+msgid "Serbian"
+msgstr "Serwies"
+
+#: conf/global_settings.py:112
+msgid "Serbian Latin"
+msgstr "Serwies Latyns"
+
+#: conf/global_settings.py:113
+msgid "Swedish"
+msgstr "Sweeds"
+
+#: conf/global_settings.py:114
+msgid "Swahili"
+msgstr "Swahili"
+
+#: conf/global_settings.py:115
+msgid "Tamil"
+msgstr "Tamil"
+
+#: conf/global_settings.py:116
+msgid "Telugu"
+msgstr "Teloegoe"
+
+#: conf/global_settings.py:117
+msgid "Thai"
+msgstr "Thai"
+
+#: conf/global_settings.py:118
+msgid "Turkish"
+msgstr "Turkish"
+
+#: conf/global_settings.py:119
+msgid "Tatar"
+msgstr "Tataars"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Oedmoerts"
+
+#: conf/global_settings.py:121
+msgid "Ukrainian"
+msgstr "Oekraïens"
+
+#: conf/global_settings.py:122
+msgid "Urdu"
+msgstr "Urdu"
+
+#: conf/global_settings.py:123
+msgid "Vietnamese"
+msgstr "Viëtnamees"
+
+#: conf/global_settings.py:124
+msgid "Simplified Chinese"
+msgstr "Vereenvoudigde Sjinees"
+
+#: conf/global_settings.py:125
+msgid "Traditional Chinese"
+msgstr "Tradisionele Chinese"
+
+#: core/validators.py:21 forms/fields.py:52
+msgid "Enter a valid value."
+msgstr "Sleutel 'n geldige waarde in."
+
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Sleutel 'n geldige e-pos adres in."
+
+#: core/validators.py:107 forms/fields.py:1013
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+"Sleutel 'n geldige \"slak\" wat bestaan ​​uit letters, syfers, beklemtoon of "
+"koppel."
+
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
+msgid "Enter a valid IPv4 address."
+msgstr "Sleutel 'n geldige IPv4-adres in."
+
+#: core/validators.py:115 core/validators.py:130
+msgid "Enter a valid IPv6 address."
+msgstr "Voer 'n geldige IPv6-adres in."
+
+#: core/validators.py:125 core/validators.py:128
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Voer 'n geldige IPv4 of IPv6-adres in."
+
+#: core/validators.py:151 db/models/fields/__init__.py:655
+msgid "Enter only digits separated by commas."
+msgstr "Sleutel slegs syfers in wat deur kommas geskei is."
+
+#: core/validators.py:157
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr ""
+"Maak seker dat hierdie waarde %(limit_value)s is (dit is %(show_value)s )."
+
+#: core/validators.py:176 forms/fields.py:210 forms/fields.py:263
+#, python-format
+msgid "Ensure this value is less than or equal to %(limit_value)s."
+msgstr ""
+"Maak seker dat hierdie waarde minder as of gelyk aan %(limit_value)s is."
+
+#: core/validators.py:182 forms/fields.py:211 forms/fields.py:264
+#, python-format
+msgid "Ensure this value is greater than or equal to %(limit_value)s."
+msgstr ""
+"Maak seker dat hierdie waarde groter as of gelyk aan %(limit_value)s is."
+
+#: core/validators.py:189
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr ""
+"Maak seker dat dit waarde ten minste %(limit_value)d karakters het (dit het "
+"%(show_value)d)."
+
+#: core/validators.py:196
+#, python-format
+msgid ""
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr ""
+"Maak seker dat dit waarde op die meeste %(limit_value)d karakters het (dit "
+"het %(show_value)d)."
+
+#: db/models/base.py:857
+#, python-format
+msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
+msgstr "%(field_name)s moet uniek wees vir %(date_field)s %(lookup)s ."
+
+#: db/models/base.py:880 forms/models.py:573
+msgid "and"
+msgstr "en"
+
+#: db/models/base.py:881 db/models/fields/__init__.py:70
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s met hierdie %(field_label)s bestaan ​​alreeds."
+
+#: db/models/fields/__init__.py:67
+#, python-format
+msgid "Value %r is not a valid choice."
+msgstr "Waarde %r is nie 'n geldige keuse nie."
+
+#: db/models/fields/__init__.py:68
+msgid "This field cannot be null."
+msgstr "Hierdie veld kan nie nil wees nie."
+
+#: db/models/fields/__init__.py:69
+msgid "This field cannot be blank."
+msgstr "Hierdie veld kan nie leeg wees nie."
+
+#: db/models/fields/__init__.py:76
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Veld van type: %(field_type)s "
+
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
+msgid "Integer"
+msgstr "Heelgetal"
+
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' waarde moet 'n heelgetal wees."
+
+#: db/models/fields/__init__.py:569
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "'%s' waarde moet waar of vals wees."
+
+#: db/models/fields/__init__.py:571
+msgid "Boolean (Either True or False)"
+msgstr "Boole (Eder waar of vals)"
+
+#: db/models/fields/__init__.py:622
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr "String (tot %(max_length)s)"
+
+#: db/models/fields/__init__.py:650
+msgid "Comma-separated integers"
+msgstr "Kommas geskeide heelgetalle"
+
+#: db/models/fields/__init__.py:664
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"'%s' waarde is in 'n ongeldige datum formaat. Dit moet in die JJJJ-MM-DD-"
+"formaat wees."
+
+#: db/models/fields/__init__.py:666 db/models/fields/__init__.py:754
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"'%s' waarde is in die korrekte formaat (JJJJ-MM-DD), maar dit is 'n "
+"ongeldige datum."
+
+#: db/models/fields/__init__.py:669
+msgid "Date (without time)"
+msgstr "Datum (sonder die tyd)"
+
+#: db/models/fields/__init__.py:752
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"'%s' waarde se formaat is ongeldig. Dit moet in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] formaat wees."
+
+#: db/models/fields/__init__.py:756
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"'%s' waarde het die regte formaat (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) maar "
+"is nie 'n geldige datum/tyd nie."
+
+#: db/models/fields/__init__.py:760
+msgid "Date (with time)"
+msgstr "Datum (met die tyd)"
+
+#: db/models/fields/__init__.py:849
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "'%s' waarde moet 'n desimale getal wees."
+
+#: db/models/fields/__init__.py:851
+msgid "Decimal number"
+msgstr "Desimale getal"
+
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "E-pos adres"
+
+#: db/models/fields/__init__.py:927
+msgid "File path"
+msgstr "Lêer pad"
+
+#: db/models/fields/__init__.py:954
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' waarde moet 'n dryfpunt getal wees."
+
+#: db/models/fields/__init__.py:956
+msgid "Floating point number"
+msgstr "Dryfpunt getal"
+
+#: db/models/fields/__init__.py:1017
+msgid "Big (8 byte) integer"
+msgstr "Groot (8 greep) heelgetal"
+
+#: db/models/fields/__init__.py:1031
+msgid "IPv4 address"
+msgstr "IPv4 adres"
+
+#: db/models/fields/__init__.py:1047
+msgid "IP address"
+msgstr "IP adres"
+
+#: db/models/fields/__init__.py:1090
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "'%s' waarde moet None, True of False wees."
+
+#: db/models/fields/__init__.py:1092
+msgid "Boolean (Either True, False or None)"
+msgstr "Boole (Eder waar, vals of niks)"
+
+#: db/models/fields/__init__.py:1141
+msgid "Positive integer"
+msgstr "Positiewe heelgetal"
+
+#: db/models/fields/__init__.py:1152
+msgid "Positive small integer"
+msgstr "Positiewe klein heelgetal"
+
+#: db/models/fields/__init__.py:1163
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (tot by %(max_length)s)"
+
+#: db/models/fields/__init__.py:1181
+msgid "Small integer"
+msgstr "Klein heelgetal"
+
+#: db/models/fields/__init__.py:1187
+msgid "Text"
+msgstr "Teks"
+
+#: db/models/fields/__init__.py:1205
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"'%s' waarde se formaat is ongeldig. Dit moet in HH:MM[:ss[.uuuuuu]] formaat "
+"wees."
+
+#: db/models/fields/__init__.py:1207
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"'%s' waarde het die regte formaat (HH:MM[:ss[.uuuuuu]]) maar is nie 'n "
+"geldige tyd nie."
+
+#: db/models/fields/__init__.py:1210
+msgid "Time"
+msgstr "Tyd"
+
+#: db/models/fields/__init__.py:1272
+msgid "URL"
+msgstr "URL"
+
+#: db/models/fields/files.py:216
+msgid "File"
+msgstr "Lêer"
+
+#: db/models/fields/files.py:323
+msgid "Image"
+msgstr "Prent"
+
+#: db/models/fields/related.py:979
+#, python-format
+msgid "Model %(model)s with pk %(pk)r does not exist."
+msgstr "Model %(model)s met private sleutel %(pk)r bestaan ​​nie."
+
+#: db/models/fields/related.py:981
+msgid "Foreign Key (type determined by related field)"
+msgstr "Vreemde sleutel (tipe bepaal deur verwante veld)"
+
+#: db/models/fields/related.py:1111
+msgid "One-to-one relationship"
+msgstr "Een-tot-een-verhouding"
+
+#: db/models/fields/related.py:1178
+msgid "Many-to-many relationship"
+msgstr "Baie-tot-baie-verwantskap"
+
+#: db/models/fields/related.py:1203
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+"Hou die \"Control\" knoppie, of \"Command\" op 'n Mac, onder om meer as een "
+"te kies."
+
+#: forms/fields.py:51
+msgid "This field is required."
+msgstr "Die veld is verpligtend."
+
+#: forms/fields.py:209
+msgid "Enter a whole number."
+msgstr "Sleutel 'n hele getal in."
+
+#: forms/fields.py:241 forms/fields.py:262
+msgid "Enter a number."
+msgstr "Sleutel 'n nommer in."
+
+#: forms/fields.py:265
+#, python-format
+msgid "Ensure that there are no more than %s digits in total."
+msgstr "Maak seker dat daar nie meer as %s syfers in totaal is nie."
+
+#: forms/fields.py:266
+#, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr "Maak seker dat daar nie meer as %s desimale plekke is nie."
+
+#: forms/fields.py:267
+#, python-format
+msgid "Ensure that there are no more than %s digits before the decimal point."
+msgstr ""
+"Maak seker dat daar nie meer as %s syfers voor die desimale punt is nie."
+
+#: forms/fields.py:355 forms/fields.py:953
+msgid "Enter a valid date."
+msgstr "Sleutel 'n geldige datum in."
+
+#: forms/fields.py:378 forms/fields.py:954
+msgid "Enter a valid time."
+msgstr "Sleutel 'n geldige tyd in."
+
+#: forms/fields.py:399
+msgid "Enter a valid date/time."
+msgstr "Sleutel 'n geldige datum/tyd in."
+
+#: forms/fields.py:475
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr ""
+"Geen lêer is ingedien nie. Maak seker die kodering tipe op die vorm is reg."
+
+#: forms/fields.py:476
+msgid "No file was submitted."
+msgstr "Geen lêer is ingedien nie."
+
+#: forms/fields.py:477
+msgid "The submitted file is empty."
+msgstr "Die ingedien lêer is leeg."
+
+#: forms/fields.py:478
+#, python-format
+msgid ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr ""
+"Maak seker dat hierdie lêernaam op die meeste %(max)d karakters het (dit is "
+"%(length)d)."
+
+#: forms/fields.py:479
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr "Stuur die lêer of tiek die maak skoon boksie, nie beide nie."
+
+#: forms/fields.py:534
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Laai 'n geldige prent. Die lêer wat jy opgelaai het is nie 'n prent nie of "
+"dit is 'n korrupte prent."
+
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Sleutel 'n geldige URL in."
+
+#: forms/fields.py:666 forms/fields.py:746
+#, python-format
+msgid "Select a valid choice. %(value)s is not one of the available choices."
+msgstr ""
+"Kies 'n geldige keuse. %(value)s is nie een van die beskikbare keuses nie."
+
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
+msgid "Enter a list of values."
+msgstr "Sleatel 'n lys van waardes in."
+
+#: forms/formsets.py:324 forms/formsets.py:326
+msgid "Order"
+msgstr "Orde"
+
+#: forms/formsets.py:328
+msgid "Delete"
+msgstr "Verwyder"
+
+#: forms/models.py:567
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr "Korrigeer die dubbele data vir %(field)s ."
+
+#: forms/models.py:571
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr "Korrigeer die dubbele data vir %(field)s , dit moet uniek wees."
+
+#: forms/models.py:577
+#, 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 ""
+"Korrigeer die dubbele data vir %(field_name)s, dit moet uniek wees vir die "
+"%(lookup)s in %(date_field)s ."
+
+#: forms/models.py:585
+msgid "Please correct the duplicate values below."
+msgstr "Korrigeer die dubbele waardes hieronder."
+
+#: forms/models.py:852
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr ""
+"Die inlyn vreemde sleutel stem nie ooreen met die ouer primêre sleutel."
+
+#: forms/models.py:913
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+"Kies 'n geldige keuse. Daardie keuse is nie een van die beskikbare keuses "
+"nie."
+
+#: forms/models.py:1003
+#, python-format
+msgid "Select a valid choice. %s is not one of the available choices."
+msgstr "Kies 'n geldige keuse. %s is nie een van die beskikbare keuses nie."
+
+#: forms/models.py:1005
+#, python-format
+msgid "\"%s\" is not a valid value for a primary key."
+msgstr "\"%s\" is nie 'n geldige waarde vir 'n primêre sleutel nie."
+
+#: forms/util.py:81
+#, 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 ""
+"%(datetime)s kon nie in tydsone %(current_timezone)s vertolk word nie; dit "
+"mag dubbelsinnig wees, of nie bestaan nie."
+
+#: forms/widgets.py:336
+msgid "Currently"
+msgstr "Op die oomblik"
+
+#: forms/widgets.py:337
+msgid "Change"
+msgstr "Verander"
+
+#: forms/widgets.py:338
+msgid "Clear"
+msgstr "Maak skoon"
+
+#: forms/widgets.py:594
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: forms/widgets.py:595
+msgid "Yes"
+msgstr "Ja"
+
+#: forms/widgets.py:596
+msgid "No"
+msgstr "Nee"
+
+#: template/defaultfilters.py:794
+msgid "yes,no,maybe"
+msgstr "Ja, nee, miskien"
+
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] "%(size)d greep"
+msgstr[1] "%(size)d grepe"
+
+#: template/defaultfilters.py:835
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: template/defaultfilters.py:837
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#: template/defaultfilters.py:839
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#: template/defaultfilters.py:841
+#, python-format
+msgid "%s TB"
+msgstr "%s TB"
+
+#: template/defaultfilters.py:842
+#, python-format
+msgid "%s PB"
+msgstr "%s PB"
+
+#: utils/dateformat.py:47
+msgid "p.m."
+msgstr "p.m."
+
+#: utils/dateformat.py:48
+msgid "a.m."
+msgstr "a.m."
+
+#: utils/dateformat.py:53
+msgid "PM"
+msgstr "PM"
+
+#: utils/dateformat.py:54
+msgid "AM"
+msgstr "AM"
+
+#: utils/dateformat.py:103
+msgid "midnight"
+msgstr "middernag"
+
+#: utils/dateformat.py:105
+msgid "noon"
+msgstr "middag"
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "Maandag"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "Dinsdag"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "Woensdag"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "Donderdag"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "Vrydag"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "Saterdag"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "Sondag"
+
+#: utils/dates.py:10
+msgid "Mon"
+msgstr "Ma"
+
+#: utils/dates.py:10
+msgid "Tue"
+msgstr "Di"
+
+#: utils/dates.py:10
+msgid "Wed"
+msgstr "Wo"
+
+#: utils/dates.py:10
+msgid "Thu"
+msgstr "Do"
+
+#: utils/dates.py:10
+msgid "Fri"
+msgstr "Vr"
+
+#: utils/dates.py:11
+msgid "Sat"
+msgstr "Sa"
+
+#: utils/dates.py:11
+msgid "Sun"
+msgstr "So"
+
+#: utils/dates.py:18
+msgid "January"
+msgstr "Januarie"
+
+#: utils/dates.py:18
+msgid "February"
+msgstr "Februarie"
+
+#: utils/dates.py:18
+msgid "March"
+msgstr "Maart"
+
+#: utils/dates.py:18
+msgid "April"
+msgstr "April"
+
+#: utils/dates.py:18
+msgid "May"
+msgstr "Mei"
+
+#: utils/dates.py:18
+msgid "June"
+msgstr "Junie"
+
+#: utils/dates.py:19
+msgid "July"
+msgstr "Julie"
+
+#: utils/dates.py:19
+msgid "August"
+msgstr "Augustus"
+
+#: utils/dates.py:19
+msgid "September"
+msgstr "September"
+
+#: utils/dates.py:19
+msgid "October"
+msgstr "Oktober"
+
+#: utils/dates.py:19
+msgid "November"
+msgstr "November"
+
+#: utils/dates.py:20
+msgid "December"
+msgstr "Desember"
+
+#: utils/dates.py:23
+msgid "jan"
+msgstr "jan"
+
+#: utils/dates.py:23
+msgid "feb"
+msgstr "feb"
+
+#: utils/dates.py:23
+msgid "mar"
+msgstr "mar"
+
+#: utils/dates.py:23
+msgid "apr"
+msgstr "apr"
+
+#: utils/dates.py:23
+msgid "may"
+msgstr "mag"
+
+#: utils/dates.py:23
+msgid "jun"
+msgstr "jun"
+
+#: utils/dates.py:24
+msgid "jul"
+msgstr "jul"
+
+#: utils/dates.py:24
+msgid "aug"
+msgstr "aug"
+
+#: utils/dates.py:24
+msgid "sep"
+msgstr "sept"
+
+#: utils/dates.py:24
+msgid "oct"
+msgstr "okt"
+
+#: utils/dates.py:24
+msgid "nov"
+msgstr "nov"
+
+#: utils/dates.py:24
+msgid "dec"
+msgstr "des"
+
+#: utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr "Jan."
+
+#: utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr "Feb."
+
+#: utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "March"
+msgstr "Maart"
+
+#: utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "April"
+msgstr "April"
+
+#: utils/dates.py:35
+msgctxt "abbrev. month"
+msgid "May"
+msgstr "Mei"
+
+#: utils/dates.py:36
+msgctxt "abbrev. month"
+msgid "June"
+msgstr "Junie"
+
+#: utils/dates.py:37
+msgctxt "abbrev. month"
+msgid "July"
+msgstr "Julie"
+
+#: utils/dates.py:38
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr "Aug."
+
+#: utils/dates.py:39
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr "Sept."
+
+#: utils/dates.py:40
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr "Okt."
+
+#: utils/dates.py:41
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr "Nov."
+
+#: utils/dates.py:42
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr "Des."
+
+#: utils/dates.py:45
+msgctxt "alt. month"
+msgid "January"
+msgstr "Januarie"
+
+#: utils/dates.py:46
+msgctxt "alt. month"
+msgid "February"
+msgstr "Februarie"
+
+#: utils/dates.py:47
+msgctxt "alt. month"
+msgid "March"
+msgstr "Maart"
+
+#: utils/dates.py:48
+msgctxt "alt. month"
+msgid "April"
+msgstr "April"
+
+#: utils/dates.py:49
+msgctxt "alt. month"
+msgid "May"
+msgstr "Mei"
+
+#: utils/dates.py:50
+msgctxt "alt. month"
+msgid "June"
+msgstr "Junie"
+
+#: utils/dates.py:51
+msgctxt "alt. month"
+msgid "July"
+msgstr "Julie"
+
+#: utils/dates.py:52
+msgctxt "alt. month"
+msgid "August"
+msgstr "Augustus"
+
+#: utils/dates.py:53
+msgctxt "alt. month"
+msgid "September"
+msgstr "September"
+
+#: utils/dates.py:54
+msgctxt "alt. month"
+msgid "October"
+msgstr "Oktober"
+
+#: utils/dates.py:55
+msgctxt "alt. month"
+msgid "November"
+msgstr "November"
+
+#: utils/dates.py:56
+msgctxt "alt. month"
+msgid "December"
+msgstr "Desember"
+
+#: utils/text.py:70
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:239
+msgid "or"
+msgstr "of"
+
+#. Translators: This string is used as a separator between list elements
+#: utils/text.py:256
+msgid ", "
+msgstr ","
+
+#: utils/timesince.py:22
+msgid "year"
+msgid_plural "years"
+msgstr[0] "jaar"
+msgstr[1] "jare"
+
+#: utils/timesince.py:23
+msgid "month"
+msgid_plural "months"
+msgstr[0] "maand"
+msgstr[1] "maande"
+
+#: utils/timesince.py:24
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "week"
+msgstr[1] "weke"
+
+#: utils/timesince.py:25
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dag"
+msgstr[1] "dae"
+
+#: utils/timesince.py:26
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "uur"
+msgstr[1] "ure"
+
+#: utils/timesince.py:27
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuut"
+msgstr[1] "minute"
+
+#: utils/timesince.py:43
+msgid "minutes"
+msgstr "minute"
+
+#: utils/timesince.py:48
+#, python-format
+msgid "%(number)d %(type)s"
+msgstr "%(number)d %(type)s"
+
+#: utils/timesince.py:54
+#, python-format
+msgid ", %(number)d %(type)s"
+msgstr ", %(number)d %(type)s"
+
+#: views/static.py:56
+msgid "Directory indexes are not allowed here."
+msgstr "Gids indekse word nie hier toegelaat nie."
+
+#: views/static.py:58
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" bestaan nie"
+
+#: views/static.py:98
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Indeks van %(directory)s"
+
+#: views/generic/dates.py:42
+msgid "No year specified"
+msgstr "Geen jaar gespesifiseer"
+
+#: views/generic/dates.py:98
+msgid "No month specified"
+msgstr "Geen maand gespesifiseer"
+
+#: views/generic/dates.py:157
+msgid "No day specified"
+msgstr "Geen dag gespesifiseer"
+
+#: views/generic/dates.py:213
+msgid "No week specified"
+msgstr "Geen week gespesifiseer"
+
+#: views/generic/dates.py:368 views/generic/dates.py:393
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "Geen %(verbose_name_plural)s beskikbaar nie"
+
+#: views/generic/dates.py:646
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+"Toekomstige %(verbose_name_plural)s is nie beskikbaar nie, omdat "
+"%(class_name)s.allow_future vals is."
+
+#: views/generic/dates.py:678
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+"Ongeldige datum string '%(datestr)s' die formaat moet wees '%(format)s'"
+
+#: views/generic/detail.py:54
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "Geen %(verbose_name)s gevind vir die soektog"
+
+#: views/generic/list.py:51
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+"Bladsy is nie 'laaste' nie, en dit kan nie omgeskakel word na 'n heelgetal "
+"nie."
+
+#: views/generic/list.py:56
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Ongeldige bladsy (%(page_number)s): %(message)s"
+
+#: views/generic/list.py:137
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr "Leë lys en ' %(class_name)s.allow_empty' is vals."
View
BIN  django/conf/locale/ar/LC_MESSAGES/django.mo
Binary file not shown
View
477 django/conf/locale/ar/LC_MESSAGES/django.po
@@ -7,355 +7,375 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:28+0100\n"
-"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
"Last-Translator: Ossama Khayat <okhayat@gmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/django/language/"
"ar/)\n"
-"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\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"
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
#: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
msgid "Arabic"
msgstr "العربيّة"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Azerbaijani"
msgstr "الأذربيجانية"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Bulgarian"
msgstr "البلغاريّة"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+